change: remove useless uri and uris (#45)

Author: nic-chen

README.md

@@ -86,9 +86,8 @@ The attributes of each element may contain these:
 
 |name       |option  |description|example|
 |:--------  |:--------|:-----------|:-----|
-|paths      |required|A list of client request uri. The default is a full match, but if the end of the path is `*`, it means that this is a prefix path. For example `/foo*`, it'll match `/foo/bar` or `/foo/glo/grey` etc.|{"/", "/aa", "/bb"}|
+|paths      |required|A list of client request path. The default is a full match, but if the end of the path is `*`, it means that this is a prefix path. For example `/foo*`, it'll match `/foo/bar` or `/foo/glo/grey` etc.|{"/", "/aa", "/bb"}|
 |hosts      |option  |A list of client request host, not only supports normal domain name, but also supports wildcard name.|{"foo.com", "*.bar.com"}|
-|uris      |option  |A list of client request uris, not only supports static uri, but also supports prefix uri.|{"/foo", "/bar/*"}|
 |remote_addrs|option  |A list of client remote address(IPv4 and IPv6), and we can use CIDR format, eg `192.168.1.0/24`.|{"127.0.0.1", "192.0.0.0/8", "::1", "fe80::/32"}|
 |methods    |option  |A list of method name. Here is full valid method list: "GET", "POST", "PUT", "DELETE", "PATCH", "HEAD", "OPTIONS", "CONNECT" and "TRACE".|{"GET", "POST"}|
 |vars       |option  |A list of `{var, operator, val}`. For example: {{var, operator, val}, {var, operator, val}, ...}, `{"arg_name", "==", "json"}` means the value of argument `name` expect to `json`. Here is the full [Operator List](#operator-list).|{{"arg_name", "==", "json"}, {"arg_age", ">", 18}}|
@@ -175,7 +174,7 @@ local rx = radix.new({
   * `method`: optional, method name of client request.
   * `host`: optional, client request host.
   * `remote_addr`: optional, client remote address like `192.168.1.100`.
-  * `uri`: optional, client request uri.
+  * `paths`: optional, a list of client request path.
   * `vars`: optional, a Lua table to fetch variable, default value is `ngx.var` to fetch Ningx builtin variable.
 
 Matchs the route by `method`, `path` and `host` etc, and return `metadata` if successful.
@@ -195,7 +194,6 @@ local metadata = rx:match(ngx.var.uri, {...})
   * `method`: optional, method name of client request.
   * `host`: optional, client request host.
   * `remote_addr`: optional, client remote address like `192.168.1.100`.
-  * `uri`: optional, client request uri.
   * `vars`: optional, a Lua table to fetch variable, default value is `ngx.var` to fetch Ningx builtin variable.
 
 Matchs the route by `method`, `path` and `host` etc, and call `handler` function if successful.

benchmark/match-parameter.lua

@@ -13,9 +13,9 @@ ngx.update_time()
 local start_time = ngx.now()
 
 local res
-local uri = "/user/gordon"
+local path = "/user/gordon"
 for _ = 1, match_times do
-    res = rx:match(uri)
+    res = rx:match(path)
 end
 
 ngx.update_time()

benchmark/match-prefix.lua

@@ -13,9 +13,9 @@ ngx.update_time()
 local start_time = ngx.now()
 
 local res
-local uri = "/" .. ngx.md5(500) .. "/a"
+local path = "/" .. ngx.md5(500) .. "/a"
 for _ = 1, match_times do
-    res = rx:match(uri)
+    res = rx:match(path)
 end
 
 ngx.update_time()

benchmark/match-static.lua

@@ -13,9 +13,9 @@ ngx.update_time()
 local start_time = ngx.now()
 
 local res
-local uri = "/" .. ngx.md5(500)
+local path = "/" .. ngx.md5(500)
 for _ = 1, match_times do
-    res = rx:match(uri)
+    res = rx:match(path)
 end
 
 ngx.update_time()

lib/resty/radixtree.lua

@@ -261,30 +261,6 @@ function pre_insert_route(self, path, route)
         route_opts.hosts = {is_wildcard, host}
     end
 
-    local uris = route.uris
-    if type(uris) == "table" and #uris > 0 then
-        route_opts.uris = {}
-        for _, uri in ipairs(uris) do
-            local is_wildcard = false
-            if uri and uri:sub(#uri, -1) == '*' then
-                is_wildcard = true
-                uri = uri:sub(1, -2)
-            end
-
-            insert_tab(route_opts.uris, is_wildcard)
-            insert_tab(route_opts.uris, uri)
-        end
-
-    elseif type(uris) == "string" then
-        local is_wildcard = false
-        if uris and uris:sub(#uris, -1) == '*' then
-            is_wildcard = true
-            uris = uris:sub(1, -2)
-        end
-
-        route_opts.uris = {is_wildcard, uris}
-    end
-
     route_opts.path_org = path
 
     local pos = string.find(path, ':', 1, true)
@@ -400,24 +376,6 @@ local function match_host(route_host_is_wildcard, route_host, request_host)
 end
 
 
-local function match_uri(route_uri_is_wildcard, route_uri, request_uri)
-    if type(request_uri) ~= "string" or #route_uri > #request_uri then
-        return false
-    end
-
-    if not route_uri_is_wildcard then
-        return route_uri == request_uri
-    end
-
-    local i = request_uri:find(route_uri, 1, true)
-    if i ~= 1 then
-        return false
-    end
-
-    return true
-end
-
-
 local tmp = {}
 local lru_pat, err = lrucache.new(1000)
 if not lru_pat then
@@ -534,14 +492,15 @@ end
 
 local function match_route_opts(route, opts, ...)
     local method = opts.method
+    local opts_matched_exists = (opts.matched ~= nil)
     if route.method ~= 0 then
         if not method or type(METHODS[method]) ~= "number" or
            bit.band(route.method, METHODS[method]) == 0 then
             return false
         end
     end
 
-    if opts.matched ~= nil then
+    if opts_matched_exists then
         opts.matched._method = method
     end
 
@@ -570,8 +529,12 @@ local function match_route_opts(route, opts, ...)
         if reverse_host then
             for i = 1, #hosts, 2 do
                 if match_host(hosts[i], hosts[i + 1], reverse_host) then
-                    if opts.matched ~= nil then
-                        opts.matched._host = hosts[i + 1]:reverse()
+                    if opts_matched_exists then
+                        if hosts[i] then
+                            opts.matched._host = (hosts[i + 1] .. "*"):reverse()
+                        else
+                            opts.matched._host = hosts[i + 1]:reverse()
+                        end
                     end
                     matched = true
                     break
@@ -585,22 +548,6 @@ local function match_route_opts(route, opts, ...)
         end
     end
 
-    if route.uris then
-        local matched = false
-        local uris = route.uris
-        for i = 1, #uris, 2 do
-            if match_uri(uris[i], uris[i + 1], opts.uri) then
-                matched = true
-                break
-            end
-        end
-
-        log_info("uris match: ", matched)
-        if not matched then
-            return false
-        end
-    end
-
     if route.vars then
         local vars = opts.vars or ngx_var
         if type(vars) ~= "table" then

t/parameter.t

@@ -186,7 +186,7 @@ matched: {}
                 },
             })
 
-            local opts = {matched = {}, method = "GET", uri = "/bb/cc/xx", host = "foo.com"}
+            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))            
@@ -199,4 +199,4 @@ GET /t
 [error]
 --- response_body
 match meta: metadata /asf
-matched: {"_path":"\/bb\/cc\/*",":ext":"xx","_method":"GET","_host":"foo.com"}
+matched: {"_path":"\/bb\/cc\/*",":ext":"xx","_method":"GET","_host":"*.bar.com"}