perf: avoid calling pcre to match every request, it is slower. (#51)

* perf: avoid calling `pcre` to match every request, it is slower.
* test: removed wrong test case and fixed title.

Author: membphis

lib/resty/radixtree.lua

@@ -50,6 +50,7 @@ local sort_tab    = table.sort
 local ngx_re      = require("ngx.re")
 local ngx_null    = ngx.null
 local empty_table = {}
+local str_find    = string.find
 
 
 setmetatable(empty_table, {__newindex = function()
@@ -280,16 +281,21 @@ function pre_insert_route(self, path, route)
     end
 
     route_opts.path_org = path
+    route_opts.param = false
 
-    local pos = string.find(path, ':', 1, true)
+    local pos = str_find(path, ':', 1, true)
     if pos then
         path = path:sub(1, pos - 1)
         route_opts.path_op = "<="
         route_opts.path = path
+        route_opts.param = true
 
     else
-        pos = string.find(path, '*', 1, true)
+        pos = str_find(path, '*', 1, true)
         if pos then
+            if pos ~= #path then
+                route_opts.param = true
+            end
             path = path:sub(1, pos - 1)
             route_opts.path_op = "<="
         else
@@ -434,10 +440,14 @@ local function fetch_pat(path)
     return pat, names
 end
 
-local function compare_gin(l_v, r_v, opts)
-    local pat, names = fetch_pat(r_v)
-    -- log_info("pat: ", require("cjson").encode(pat))
-    local m = re_match(l_v, pat, "jo")
+local function compare_param(req_path, route, opts)
+    if not opts.matched and not route.param then
+        return true
+    end
+
+    local pat, names = fetch_pat(route.path_org)
+    log_info("pcre pat: ", pat)
+    local m = re_match(req_path, pat, "jo")
     if not m then
         return false
     end
@@ -502,8 +512,8 @@ local compare_funcs = {
         end
         return false
     end,
-    ["IN"] = in_array,    
-    ["in"] = in_array,    
+    ["IN"] = in_array,
+    ["in"] = in_array,
 }
 
 
@@ -622,10 +632,10 @@ local function _match_from_routes(routes, path, opts, ...)
         if match_route_opts(route, opts, ...) then
             -- log_info("matched route: ", require("cjson").encode(route))
             -- log_info("matched path: ", path)
-            if compare_gin(path, route.path_org, opts) then
-                    if opts_matched_exists then
-                        opts.matched._path = route.path_org
-                    end
+            if compare_param(path, route, opts) then
+                if opts_matched_exists then
+                    opts.matched._path = route.path_org
+                end
                 return route
             end
         end

t/parameter.t

@@ -171,39 +171,7 @@ matched: {}
 
 
 
-=== TEST 6: /name/:name/id/:id
---- config
-    location /t {
-        content_by_lua_block {
-            local json = require("cjson.safe")
-            local radix = require("resty.radixtree")
-            local rx = radix.new({
-                {
-                    paths = {"/aa/*", "/bb/cc/*", "/dd/ee/index.html"},
-                    methods = {"GET", "POST", "PUT"},
-                    hosts = {"foo.com", "*.bar.com"},
-                    metadata = "metadata /asf",
-                },
-            })
-
-            local opts = {matched = {}, method = "GET", host = "aa.bar.com"}
-            local meta = rx:match("/bb/cc/xx", opts)
-            ngx.say("match meta: ", meta)
-            ngx.say("matched: ", json.encode(opts.matched))
-
-        }
-    }
---- request
-GET /t
---- no_error_log
-[error]
---- response_body
-match meta: metadata /asf
-matched: {"_path":"\/bb\/cc\/*",":ext":"xx","_method":"GET","_host":"*.bar.com"}
-
-
-
-=== TEST 7: /name/*name/foo (cached parameter)
+=== TEST 6: /name/:name/foo (cached parameter)
 --- config
     location /t {
         content_by_lua_block {
@@ -238,7 +206,7 @@ matched: {}
 
 
 
-=== TEST 8: /name/*name/foo (no cached parameter)
+=== TEST 7: /name/:name/foo (no cached parameter)
 --- config
     location /t {
         content_by_lua_block {
@@ -265,3 +233,5 @@ GET /t
 --- response_body
 match meta: metadata /name
 match meta: nil
+--- error_log
+pcre pat:

t/path.t

@@ -96,6 +96,7 @@ nil
 GET /t
 --- no_error_log
 [error]
+pcre pat:
 --- response_body
 metadata multipe path 1
 metadata multipe path 1