optimize: make host match ~15% faster (#59)

Author: spacewander

Makefile

@@ -85,6 +85,10 @@ bench:
 	@echo ""
 	resty -I=./lib -I=./deps/share/lua/5.1 benchmark/match-static.lua
 	@echo ""
+	resty -I=./lib -I=./deps/share/lua/5.1 benchmark/match-hosts.lua
+	@echo ""
+	resty -I=./lib -I=./deps/share/lua/5.1 benchmark/match-wildcard-hosts.lua
+	@echo ""
 
 
 ### help:         Show Makefile rules

benchmark/match-hosts.lua

@@ -0,0 +1,30 @@
+local radix = require("resty.radixtree")
+local route_count = 1000 * 1
+local match_times = 1000 * 5
+
+local path = "/12345"
+local routes = {}
+for i = 1, route_count do
+    routes[i] = {paths = {path}, hosts = {ngx.md5(i)}, metadata = i}
+end
+
+local rx = radix.new(routes)
+
+ngx.update_time()
+local start_time = ngx.now()
+
+local res
+local opts = {
+    host = ngx.md5(500),
+}
+for _ = 1, match_times do
+    res = rx:match(path, opts)
+end
+
+ngx.update_time()
+local used_time = ngx.now() - start_time
+ngx.say("matched res: ", res)
+ngx.say("route count: ", route_count)
+ngx.say("match times: ", match_times)
+ngx.say("time used  : ", used_time, " sec")
+ngx.say("QPS        : ", math.floor(match_times / used_time))

benchmark/match-wildcard-hosts.lua

@@ -0,0 +1,30 @@
+local radix = require("resty.radixtree")
+local route_count = 1000 * 1
+local match_times = 1000 * 5
+
+local path = "/12345"
+local routes = {}
+for i = 1, route_count do
+    routes[i] = {paths = {path}, hosts = {"*." .. ngx.md5(i)}, metadata = i}
+end
+
+local rx = radix.new(routes)
+
+ngx.update_time()
+local start_time = ngx.now()
+
+local res
+local opts = {
+    host = "1." .. ngx.md5(500),
+}
+for _ = 1, match_times do
+    res = rx:match(path, opts)
+end
+
+ngx.update_time()
+local used_time = ngx.now() - start_time
+ngx.say("matched res: ", res)
+ngx.say("route count: ", route_count)
+ngx.say("match times: ", match_times)
+ngx.say("time used  : ", used_time, " sec")
+ngx.say("QPS        : ", math.floor(match_times / used_time))

lib/resty/radixtree.lua

@@ -30,6 +30,7 @@ local new_tab     = base.new_tab
 local tonumber    = tonumber
 local ipairs      = ipairs
 local ffi         = require("ffi")
+local C           = ffi.C
 local ffi_cast    = ffi.cast
 local ffi_cdef    = ffi.cdef
 local insert_tab  = table.insert
@@ -101,6 +102,8 @@ end
 
 
 ffi_cdef[[
+    int memcmp(const void *s1, const void *s2, size_t n);
+
     void *radix_tree_new();
     int radix_tree_destroy(void *t);
     int radix_tree_insert(void *t, const unsigned char *buf, size_t len,
@@ -126,6 +129,18 @@ end
 local _M = { _VERSION = 1.7 }
 
 
+local function has_suffix(s, suffix)
+    if type(s) ~= "string" or type(suffix) ~= "string" then
+        return false
+    end
+    if #s < #suffix then
+        return false
+    end
+    local rc = C.memcmp(ffi.cast("char *", s) + #s - #suffix, suffix, #suffix)
+    return rc == 0
+end
+
+
 -- only work under lua51 or luajit
 local function setmt__gc(t, mt)
     local prox = newproxy(true)
@@ -258,9 +273,7 @@ function pre_insert_route(self, path, route)
             local is_wildcard = false
             if h and h:sub(1, 1) == '*' then
                 is_wildcard = true
-                h = h:sub(2):reverse()
-            else
-                h = h:reverse()
+                h = h:sub(2)
             end
 
             insert_tab(route_opts.hosts, is_wildcard)
@@ -272,9 +285,7 @@ function pre_insert_route(self, path, route)
         local host = hosts
         if host:sub(1, 1) == '*' then
             is_wildcard = true
-            host = host:sub(2):reverse()
-        else
-            host = host:reverse()
+            host = host:sub(2)
         end
 
         route_opts.hosts = {is_wildcard, host}
@@ -383,20 +394,11 @@ end
 
 
 local function match_host(route_host_is_wildcard, route_host, request_host)
-    if type(request_host) ~= "string" or #route_host > #request_host then
-        return false
-    end
-
     if not route_host_is_wildcard then
         return route_host == request_host
     end
 
-    local i = request_host:find(route_host, 1, true)
-    if i ~= 1 then
-        return false
-    end
-
-    return true
+    return has_suffix(request_host, route_host)
 end
 
 
@@ -564,20 +566,16 @@ local function match_route_opts(route, opts, ...)
     if route.hosts then
         local matched = false
 
-        if opts.host and not opts.host_reversed then
-            opts.host_reversed = opts.host:reverse()
-        end
-
         local hosts = route.hosts
-        local reverse_host = opts.host_reversed
-        if reverse_host then
+        local host = opts.host
+        if host then
             for i = 1, #hosts, 2 do
-                if match_host(hosts[i], hosts[i + 1], reverse_host) then
+                if match_host(hosts[i], hosts[i + 1], host) then
                     if opts_matched_exists then
                         if hosts[i] then
-                            opts.matched._host = (hosts[i + 1] .. "*"):reverse()
+                            opts.matched._host = "*" .. hosts[i + 1]
                         else
-                            opts.matched._host = hosts[i + 1]:reverse()
+                            opts.matched._host = opts.host
                         end
                     end
                     matched = true

t/host.t

@@ -22,6 +22,10 @@ __DATA__
 
             ngx.say(rx:match("/aa/bb", {host = "foo.com"}))
             ngx.say(rx:match("/aa/bb", {host = "www.foo.com"}))
+
+            local opts = {host = "foo.com", matched = {}}
+            rx:match("/aa/bb", opts)
+            ngx.say("matched: ", opts.matched._host)
         }
     }
 --- request
@@ -31,6 +35,7 @@ GET /t
 --- response_body
 metadata /aa
 nil
+matched: foo.com
 
 
 
@@ -51,6 +56,10 @@ nil
             ngx.say(rx:match("/aa/bb", {host = ".foo.com"}))
             ngx.say(rx:match("/aa/bb", {host = "www.foo.com"}))
             ngx.say(rx:match("/aa/bb", {host = "www.bar.foo.com"}))
+
+            local opts = {host = "www.foo.com", matched = {}}
+            rx:match("/aa/bb", opts)
+            ngx.say("matched: ", opts.matched._host)
         }
     }
 --- request
@@ -62,6 +71,7 @@ nil
 metadata /aa
 metadata /aa
 metadata /aa
+matched: *.foo.com
 
 
 
@@ -122,3 +132,61 @@ metadata /aa
 nil
 metadata /aa
 nil
+
+
+
+=== TEST 5: hosts in string type
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = {"/aa*"},
+                    metadata = "metadata /aa",
+                    hosts = "foo.com",
+                }
+            })
+
+            ngx.say(rx:match("/aa/bb", {host = "foo.com"}))
+            ngx.say(rx:match("/aa/bb", {host = "www.foo.com"}))
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+metadata /aa
+nil
+
+
+
+=== TEST 6: wildcard hosts in string type
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = {"/aa*"},
+                    hosts = "*.foo.com",
+                    metadata = "metadata /aa",
+                }
+            })
+
+            ngx.say(rx:match("/aa/bb", {host = "foo.com"}))
+            ngx.say(rx:match("/aa/bb", {host = ".foo.com"}))
+            ngx.say(rx:match("/aa/bb", {host = "www.foo.com"}))
+            ngx.say(rx:match("/aa/bb", {host = "www.bar.foo.com"}))
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+nil
+metadata /aa
+metadata /aa
+metadata /aa