You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/05/06 11:39:20 UTC
[apisix] branch master updated: feat: upgrade lua-resty-radixtree &
retire patch (#4185)
This is an automated email from the ASF dual-hosted git repository.
tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new b551f42 feat: upgrade lua-resty-radixtree & retire patch (#4185)
b551f42 is described below
commit b551f42d90d07598efd775fdeac392043534f8b4
Author: 罗泽轩 <sp...@gmail.com>
AuthorDate: Thu May 6 19:39:13 2021 +0800
feat: upgrade lua-resty-radixtree & retire patch (#4185)
Signed-off-by: spacewander <sp...@gmail.com>
---
apisix/patch.lua | 24 ------------------------
rockspec/apisix-master-0.rockspec | 4 ++--
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/apisix/patch.lua b/apisix/patch.lua
index 66bf17d..a291110 100644
--- a/apisix/patch.lua
+++ b/apisix/patch.lua
@@ -24,7 +24,6 @@ local ngx_socket = ngx.socket
local original_tcp = ngx.socket.tcp
local concat_tab = table.concat
local new_tab = require("table.new")
-local expr = require("resty.expr.v1")
local log = ngx.log
local WARN = ngx.WARN
local ipairs = ipairs
@@ -268,27 +267,6 @@ local function luasocket_tcp()
end
-local patched_expr_new
-do
- local function eval_empty_rule(self, ctx, ...)
- return true
- end
-
-
- local mt = {__index = {eval = eval_empty_rule}}
- local old_expr_new = expr.new
-
-
- function patched_expr_new(rule)
- if #rule == 0 then
- return setmetatable({}, mt)
- end
-
- return old_expr_new(rule)
- end
-end
-
-
function _M.patch()
-- make linter happy
-- luacheck: ignore
@@ -300,8 +278,6 @@ function _M.patch()
return luasocket_tcp()
end
-
- expr.new = patched_expr_new
end
diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
index bc1082f..6207610 100644
--- a/rockspec/apisix-master-0.rockspec
+++ b/rockspec/apisix-master-0.rockspec
@@ -44,7 +44,7 @@ dependencies = {
"lua-resty-cookie = 0.1.0",
"lua-resty-session = 2.24",
"opentracing-openresty = 0.1",
- "lua-resty-radixtree = 2.7.0",
+ "lua-resty-radixtree = 2.8.0",
"lua-protobuf = 0.3.1",
"lua-resty-openidc = 1.7.2-1",
"luafilesystem = 1.7.0-2",
@@ -59,7 +59,7 @@ dependencies = {
"binaryheap = 0.4",
"dkjson = 2.5-2",
"resty-redis-cluster = 1.02-4",
- "lua-resty-expr = 1.2.0",
+ "lua-resty-expr = 1.3.0",
"graphql = 0.0.2",
"argparse = 0.7.1-1",
"luasocket = 3.0rc1-2",