Merge branch 'master' into record-matched

Author: johzchen

lib/resty/radixtree.lua

@@ -30,6 +30,7 @@ local re_find     = ngx.re.find
 local re_match    = ngx.re.match
 local sort_tab    = table.sort
 local ngx_re      = require("ngx.re")
+local ngx_null    = ngx.null
 local empty_table = {}
 
 
@@ -482,22 +483,29 @@ end
 local compare_funcs = {
     ["=="] = function (l_v, r_v)
         if type(r_v) == "number" then
-            return tonumber(l_v) == r_v
+            l_v = tonumber(l_v)
+            if not l_v then
+                return false
+            end
         end
         return l_v == r_v
     end,
     ["~="] = function (l_v, r_v)
         return l_v ~= r_v
     end,
     [">"] = function (l_v, r_v)
-        if type(r_v) == "number" then
-            return tonumber(l_v) > r_v
+        l_v = tonumber(l_v)
+        r_v = tonumber(r_v)
+        if not l_v or not r_v then
+            return false
         end
         return l_v > r_v
     end,
     ["<"] = function (l_v, r_v)
-        if type(r_v) == "number" then
-            return tonumber(l_v) < r_v
+        l_v = tonumber(l_v)
+        r_v = tonumber(r_v)
+        if not l_v or not r_v then
+            return false
         end
         return l_v < r_v
     end,
@@ -512,6 +520,10 @@ local compare_funcs = {
 
 
 local function compare_val(l_v, op, r_v, opts)
+    if r_v == ngx_null then
+        r_v = nil
+    end
+
     local com_fun = compare_funcs[op or "=="]
     if not com_fun then
         return false
@@ -596,19 +608,9 @@ local function match_route_opts(route, opts, ...)
         end
 
         for _, route_var in ipairs(route.vars) do
-            local l_v, op, r_v
-            if #route_var == 2 then
-                l_v, r_v = route_var[1], route_var[2]
-                op = "=="
-            else
-                l_v, op, r_v = route_var[1], route_var[2], route_var[3]
-            end
+            local l_v, op, r_v = route_var[1], route_var[2], route_var[3]
             l_v = vars[l_v]
 
-            -- ngx.log(ngx.INFO, l_v, op, r_v)
-            if l_v == nil or r_v == nil then
-                return false
-            end
             if not compare_val(l_v, op, r_v, opts) then
                 return false
             end

rockspec/lua-resty-radixtree-1.9-0.rockspec

@@ -0,0 +1,36 @@
+package = "lua-resty-radixtree"
+version = "1.9-0"
+source = {
+    url = "git://github.com/api7/lua-resty-radixtree",
+    tag = "v1.9",
+}
+
+description = {
+    summary = "Adaptive Radix Trees implemented in Lua for OpenResty",
+    homepage = "https://github.com/api7/lua-resty-radixtree",
+    license = "Apache License 2.0",
+    maintainer = "Yuansheng Wang <[email protected]>"
+}
+
+dependencies = {
+    "lua-resty-ipmatcher",
+}
+
+build = {
+    type = "make",
+    build_variables = {
+            CFLAGS="$(CFLAGS) -std=c99 -g -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast",
+            LIBFLAG="$(LIBFLAG)",
+            LUA_LIBDIR="$(LUA_LIBDIR)",
+            LUA_BINDIR="$(LUA_BINDIR)",
+            LUA_INCDIR="$(LUA_INCDIR)",
+            LUA="$(LUA)",
+        },
+        install_variables = {
+            INST_PREFIX="$(PREFIX)",
+            INST_BINDIR="$(BINDIR)",
+            INST_LIBDIR="$(LIBDIR)",
+            INST_LUADIR="$(LUADIR)",
+            INST_CONFDIR="$(CONFDIR)",
+        },
+}

t/vars.t

@@ -17,7 +17,7 @@ __DATA__
                     paths = "/aa",
                     metadata = "metadata /aa",
                     vars = {
-                        {"arg_k", "v"},
+                        {"arg_k", "==", "v"},
                     },
                 }
             })
@@ -71,7 +71,7 @@ nil
                     paths = "/aa",
                     metadata = "metadata /aa",
                     vars = {
-                        {"http_test", "v"},
+                        {"http_test", "==", "v"},
                     }
                 }
             })
@@ -129,9 +129,9 @@ nil
                     paths = "/aa",
                     metadata = "metadata /aa",
                     vars = {
-                        {"arg_k", "v"},
-                        {"host", "localhost"},
-                        {"server_port", "1984"},
+                        {"arg_k", "==", "v"},
+                        {"host", "==", "localhost"},
+                        {"server_port", "==", "1984"},
                     }
                 }
             })
@@ -187,9 +187,9 @@ nil
                     paths = "/aa",
                     metadata = "metadata /aa",
                     vars = {
-                        {"arg_k", "v"},
-                        {"host", "localhost"},
-                        {"server_port", "1984"},
+                        {"arg_k", "==", "v"},
+                        {"host", "==", "localhost"},
+                        {"server_port", "==", "1984"},
                     }
                 }
             })
@@ -351,7 +351,7 @@ nil
                     paths = "/aa",
                     metadata = "metadata /aa",
                     vars = {
-                        {"arg_k", "v"},
+                        {"arg_k", "==", "v"},
                     },
                 },
                 {
@@ -472,3 +472,29 @@ GET /t
 [error]
 --- response_body
 nil
+
+
+
+=== TEST 17: ~= nil
+--- config
+    location /t {
+        content_by_lua_block {
+            local radix = require("resty.radixtree")
+            local rx = radix.new({
+                {
+                    paths = "/aa",
+                    metadata = "metadata /aa",
+                    vars = {
+                        {"arg_k", "~=", nil},
+                    },
+                }
+            })
+            ngx.say(rx:match("/aa", {vars = ngx.var}))
+        }
+    }
+--- request
+GET /t?k=v
+--- no_error_log
+[error]
+--- response_body
+metadata /aa