bugfix: failed to match route when no matched in opts. (#50)

Author: membphis

lib/resty/radixtree.lua

@@ -429,23 +429,22 @@ local function fetch_pat(path)
         end
     end
 
-    local pat = table.concat(res, [[\/]])
+    pat = table.concat(res, [[\/]])
     lru_pat:set(path, {pat, names}, 60 * 60)
     return pat, names
 end
 
 local function compare_gin(l_v, r_v, opts)
-    if not opts.matched then
-        return true
-    end
-
     local pat, names = fetch_pat(r_v)
     -- log_info("pat: ", require("cjson").encode(pat))
     local m = re_match(l_v, pat, "jo")
     if not m then
         return false
     end
 
+    if not opts.matched then
+        return true
+    end
 
     for i, v in ipairs(m) do
         local name = names[i]

t/parameter.t

@@ -189,7 +189,7 @@ matched: {}
             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))            
+            ngx.say("matched: ", json.encode(opts.matched))
 
         }
     }
@@ -203,15 +203,15 @@ matched: {"_path":"\/bb\/cc\/*",":ext":"xx","_method":"GET","_host":"*.bar.com"}
 
 
 
-=== TEST 7: /name/*name/foo
+=== TEST 7: /name/*name/foo (cached parameter)
 --- config
     location /t {
         content_by_lua_block {
             local json = require("cjson.safe")
             local radix = require("resty.radixtree")
             local rx = radix.new({
                 {
-                    paths = {"/name/*name/foo"},
+                    paths = {"/name/:name/foo"},
                     metadata = "metadata /name",
                 },
             })
@@ -232,6 +232,36 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /name
-matched: {"_path":"\/name\/*name\/foo","name":"json"}
+matched: {"_path":"\/name\/:name\/foo","name":"json"}
 match meta: nil
 matched: {}
+
+
+
+=== TEST 8: /name/*name/foo (no cached parameter)
+--- config
+    location /t {
+        content_by_lua_block {
+            local json = require("cjson.safe")
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = {"/name/:name/foo"},
+                    metadata = "metadata /name",
+                },
+            })
+
+            local opts = {}
+            local meta = rx:match("/name/json/foo", opts)
+            ngx.say("match meta: ", meta)
+            meta = rx:match("/name/json", opts)
+            ngx.say("match meta: ", meta)
+        }
+    }
+--- request
+GET /t
+--- no_error_log
+[error]
+--- response_body
+match meta: metadata /name
+match meta: nil