From e139731d9ea365a3903c81f4d03e65eba19ab02f Mon Sep 17 00:00:00 2001 From: lionsoul2014 Date: Sun, 25 Jan 2026 14:23:09 +0800 Subject: [PATCH] update the demo tests to the latest result --- binding/c/{ReadMe.md => README.md} | 12 ++++++------ binding/golang/README.md | 9 +++++---- binding/java/README.md | 13 +++++++------ .../lionsoul/ip2region/service/Ip2RegionTest.java | 4 ++-- binding/javascript/{ReadMe.md => README.md} | 12 +++++++----- 5 files changed, 27 insertions(+), 23 deletions(-) rename binding/c/{ReadMe.md => README.md} (96%) rename binding/javascript/{ReadMe.md => README.md} (95%) diff --git a/binding/c/ReadMe.md b/binding/c/README.md similarity index 96% rename from binding/c/ReadMe.md rename to binding/c/README.md index e5b5611..e2e359b 100644 --- a/binding/c/ReadMe.md +++ b/binding/c/README.md @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) { // 2、调用 search API 查询，IPv4 和 IPv6 都支持. const char *ip_string = "1.2.3.4"; - // ip_string = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 + // ip_string = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 long cost_time = 0, s_time = xdb_now(); err = xdb_search_by_string(&searcher, ip_string, ®ion); @@ -151,7 +151,7 @@ int main(int argc, char *argv[]) { // 3、调用 search API 查询，IPv4 和 IPv6 都支持 const char *ip_string = "1.2.3.4"; - // ip_string = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 + // ip_string = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 long cost_time = 0, s_time = xdb_now(); err = xdb_search_by_string(&searcher, ip_string, ®ion); @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) { // 3、调用 search API 查询，IPv4 和 IPv6 都支持 const char *ip_string = "1.2.3.4"; - // ip_string = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 + // ip_string = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 long cost_time = 0, s_time = xdb_now(); err = xdb_search_by_string(&searcher, ip_string, ®ion); @@ -305,7 +305,7 @@ ip2region xdb searcher test program source xdb: ../../data/ip2region_v4.xdb (IPv4, vectorIndex) type 'quit' to exit ip2region>> 120.229.45.2 -{region: 中国|广东省|深圳市|移动, io_count: 3, took: 29 μs} +{region: 中国|广东省|深圳市|移动|CN, io_count: 3, took: 13 μs} ``` 例如：使用默认的 data/ip2region_v6.xdb 进行 IPv6 查询测试： @@ -317,9 +317,9 @@ type 'quit' to exit ip2region>> :: {region: , io_count: 1, took: 38 μs} ip2region>> 2604:bc80:8001:11a4:ffff:ffff:ffff:ffff -{region: 美国|特拉华州|刘易斯|数据中心, io_count: 14, took: 77 μs} +{region: United States|Florida|Miami|velia.net Internetdienste GmbH|US, io_count: 14, took: 76 μs} ip2region>> 240e:3b7:3272:d8d0:db09:c067:8d59:539e -{region: 中国|广东省|深圳市|家庭宽带, io_count: 8, took: 46 μs} +{region: 中国|广东省|深圳市|电信|CN, io_count: 8, took: 42 μs} ``` 输入 ip 即可进行查询，输入 quit 即可退出测试程序。也可以分别设置 `cache-policy` 为 file/vectorIndex/content 来测试三种不同的缓存实现的效率。 diff --git a/binding/golang/README.md b/binding/golang/README.md index c1574cf..e665e34 100644 --- a/binding/golang/README.md +++ b/binding/golang/README.md @@ -107,7 +107,7 @@ func main() { // 定位信息查询：IPv4 或者 IPv6 的地址都支持 var ip = "1.2.3.4" // IPv4 - // ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff" // IPv6 + // ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e" // IPv6 var tStart = time.Now() region, err := searcher.SearchByStr(ip) if err != nil { @@ -205,10 +205,11 @@ ip2region search service test program +-v6 db: /data01/code/c/ip2region/data/ip2region_v6.xdb (vectorIndex) type 'quit' to exit ip2region>> 1.2.3.4 -{region: 美国|华盛顿|0|谷歌, took: 69.088µs} +{region: Australia|Queensland|Brisbane|0|AU, took: 50.216µs} ip2region>> 240e:3b7:3272:d8d0:db09:c067:8d59:539e -{region: 中国|广东省|深圳市|家庭宽带, took: 67.756µs} -ip2region>> +{region: 中国|广东省|深圳市|电信|CN, took: 100.606µs} +ip2region>> 2604:a840:3::a04d +{region: United States|California|San Jose|xTom|US, took: 99.078µs} ``` 输入 v4 或者 v6 的 IP 地址即可进行查询测试，也可以分别设置 `cache-policy` 为 file/vectorIndex/content 来测试三种不同缓存实现的查询效果。 diff --git a/binding/java/README.md b/binding/java/README.md index 7f56041..81d5fcf 100644 --- a/binding/java/README.md +++ b/binding/java/README.md @@ -123,7 +123,7 @@ public class SearcherTest { // 2、查询，IPv4 或者 IPv6 的地址都支持 try { String ip = "1.2.3.4"; - // ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 + // ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 long sTime = System.nanoTime(); String region = searcher.search(ip); long cost = TimeUnit.NANOSECONDS.toMicros((long) (System.nanoTime() - sTime)); @@ -173,7 +173,7 @@ public class SearcherTest { // 3、查询，IPv4 或者 IPv6 地址都支持 try { String ip = "1.2.3.4"; - // ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 + // ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 long sTime = System.nanoTime(); String region = searcher.search(ip); long cost = TimeUnit.NANOSECONDS.toMicros((long) (System.nanoTime() - sTime)); @@ -224,7 +224,7 @@ public class SearcherTest { // 3、查询，IPv4 和 IPv6 都支持 try { String ip = "1.2.3.4"; - // ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 + // ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 long sTime = System.nanoTime(); String region = searcher.search(ip); long cost = TimeUnit.NANOSECONDS.toMicros((long) (System.nanoTime() - sTime)); @@ -294,10 +294,11 @@ ip2region search service test program +-v6 xdb: /data01/code/c/ip2region/data/ip2region_v6.xdb (vectorIndex) type 'quit' to exit ip2region>> 1.2.3.4 -{region: 美国|华盛顿|0|谷歌, took: 159 μs} +{region: Australia|Queensland|Brisbane|0|AU, took: 140 μs} ip2region>> 240e:3b7:3272:d8d0:db09:c067:8d59:539e -{region: 中国|广东省|深圳市|家庭宽带, took: 346 μs} -ip2region>> +{region: 中国|广东省|深圳市|电信|CN, took: 391 μs} +ip2region>> 2604:a840:3::a04d +{region: United States|California|San Jose|xTom|US, took: 503 μs} ``` 输入 v4 或者 v6 的 IP 地址即可进行查询测试，也可以分别设置 `cache-policy` 为 file/vectorIndex/content 来测试三种不同缓存实现的查询效果。 diff --git a/binding/java/src/test/java/org/lionsoul/ip2region/service/Ip2RegionTest.java b/binding/java/src/test/java/org/lionsoul/ip2region/service/Ip2RegionTest.java index d78829d..e894c14 100644 --- a/binding/java/src/test/java/org/lionsoul/ip2region/service/Ip2RegionTest.java +++ b/binding/java/src/test/java/org/lionsoul/ip2region/service/Ip2RegionTest.java @@ -119,9 +119,9 @@ public class Ip2RegionTest { try { final String region = ip2Region.search(ipBytes); if (ipBytes.length == 4) { - assertEquals("v4 region not equals", region, "中国|广东省|深圳市|电信"); + assertEquals("v4 region not equals", region, "中国|广东省|深圳市|电信|CN"); } else { - assertEquals("v6 region not equals", region, "中国|广东省|深圳市|家庭宽带"); + assertEquals("v6 region not equals", region, "中国|广东省|深圳市|电信|CN"); } } catch (InetAddressException | IOException | InterruptedException e) { log.errorf("failed to search(%s): %s", Util.ipToString(ipBytes), e.getMessage()); diff --git a/binding/javascript/ReadMe.md b/binding/javascript/README.md similarity index 95% rename from binding/javascript/ReadMe.md rename to binding/javascript/README.md index ea9a2c4..eb55e58 100644 --- a/binding/javascript/ReadMe.md +++ b/binding/javascript/README.md @@ -67,7 +67,7 @@ try { // 2、查询，IPv4 或者 IPv6 的地址都是同一个接口 let ip = "1.2.3.4"; -// ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 +// ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 try { let region = searcher.search(ip); console.log(`search(${ip}): {region: ${region}, ioCount: ${searcher.getIOCount()}}`); @@ -108,7 +108,7 @@ try { // 3、查询，IPv4 或者 IPv6 的地址都是同一个接口 let ip = "1.2.3.4"; -// ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 +// ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 try { let region = searcher.search(ip); console.log(`search(${ip}): {region: ${region}, ioCount: ${searcher.getIOCount()}}`); @@ -148,7 +148,7 @@ try { // 3、查询，IPv4 或者 IPv6 的地址都是同一个接口 let ip = "1.2.3.4"; -// ip = "2001:4:112:ffff:ffff:ffff:ffff:ffff"; // IPv6 +// ip = "240e:3b7:3272:d8d0:db09:c067:8d59:539e"; // IPv6 try { let region = searcher.search(ip); console.log(`search(${ip}): {region: ${region}`); @@ -186,7 +186,7 @@ ip2region xdb searcher test program source xdb: ../../data/ip2region_v4.xdb (IPv4, vectorIndex) type 'quit' to exit ip2region>> 1.2.3.4 -{region: 美国|华盛顿|0|谷歌, ioCount: 7, took: 0.430357 μs} +{region: Australia|Queensland|Brisbane|0|AU, ioCount: 5, took: 657.035 μs} ``` 例如：使用默认的 data/ip2region_v6.xdb 文件进行 IPv6 的查询测试： @@ -196,7 +196,9 @@ ip2region xdb searcher test program source xdb: ../../data/ip2region_v6.xdb (IPv6, vectorIndex) type 'quit' to exit ip2region>> 240e:3b7:3272:d8d0:db09:c067:8d59:539e -{region: 中国|广东省|深圳市|家庭宽带, ioCount: 14, took: 4.727663 μs} +{region: 中国|广东省|深圳市|电信|CN, ioCount: 8, took: 98.953 μs} +ip2region>> 2604:a840:3::a04d +{region: United States|California|San Jose|xTom|US, ioCount: 13, took: 287.703 μs} ``` 输入 ip 即可进行查询测试，也可以分别设置 `cache-policy` 为 file/vectorIndex/content 来测试三种不同缓存实现的查询效果。