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

optimize the args checking

This commit is contained in:
Lion 2022-06-30 18:35:59 +08:00
parent b8710c17d8
commit d819ff2047
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binding/lua_c/util_test.lua
View File

@ -76,8 +76,11 @@ local ip_str = "1.2.3.4"
searcher, err = xdb.new_with_file_only("../../data/ip2region.xdb") searcher, err = xdb.new_with_file_only("../../data/ip2region.xdb")
local t_start = xdb.now() local t_start = xdb.now()
region, err = searcher:search(ip_str) region, err = searcher:search(ip_str)
local c_time = xdb.now() - t_start
print(string.format("search(%s): {region=%s, io_count: %d, took: %dμs, err=%s}", print(string.format("search(%s): {region=%s, io_count: %d, took: %dμs, err=%s}",
ip_str, region, searcher:get_io_count(), xdb.now() - t_start, err)) ip_str, region, searcher:get_io_count(), c_time, err))
print(string.format("searcher.tostring=%s", searcher))
searcher:close()
print("") print("")

6
binding/lua_c/xdb_searcher.c
View File

@ -56,7 +56,7 @@ static int lua_xdb_new_with_vector_index(lua_State *L) {
// check the db path and vector index buffer // check the db path and vector index buffer
db_path = luaL_checkstring(L, 1); db_path = luaL_checkstring(L, 1);
if (db_path == NULL) { if (db_path == NULL) {
return luaL_error(L, "ip2region.xdb file path expected"); return luaL_error(L, "xdb file path expected");
} }
v_index = luaL_checkstring(L, 2); v_index = luaL_checkstring(L, 2);
@ -140,7 +140,7 @@ static int lua_xdb_search(lua_State *L) {
// get the searcher // get the searcher
searcher = (xdb_searcher_t *) luaL_checkudata(L, 1, XDB_METATABLE_NAME); searcher = (xdb_searcher_t *) luaL_checkudata(L, 1, XDB_METATABLE_NAME);
if (searcher == NULL) { if (searcher == NULL) {
return luaL_error(L, "call via ':' or broken xdb searcher instance"); return luaL_error(L, "call via ':' or xdb searcher was broken");
} }
// input ip type checking // input ip type checking
@ -174,7 +174,7 @@ static int lua_xdb_get_io_count(lua_State *L) {
searcher = (xdb_searcher_t *) luaL_checkudata(L, 1, XDB_METATABLE_NAME); searcher = (xdb_searcher_t *) luaL_checkudata(L, 1, XDB_METATABLE_NAME);
if (searcher == NULL) { if (searcher == NULL) {
return luaL_error(L, "broken xdb searcher instance"); return luaL_error(L, "call method via ':' or xdb searcher was broken");
} }
lua_pushinteger(L, xdb_get_io_count(searcher)); lua_pushinteger(L, xdb_get_io_count(searcher));