change: updated to support the ngx_http_lua module without old CFunction APIs.

Author: thibaultcha

.luacheckrc

@@ -1,5 +1,5 @@
 std = 'ngx_lua'
-globals = { 'ngx' }
+globals = { 'ngx', 'ndk' }
 unused_args = false
 read_globals = {
  "coroutine._yield"

lib/resty/core/misc.lua

@@ -16,7 +16,9 @@ local new_tab = base.new_tab
 local C = ffi.C
 local ffi_new = ffi.new
 local ffi_str = ffi.string
-local getmetatable = getmetatable
+local setmetatable = setmetatable
+local rawget = rawget
+local rawset = rawset
 local ngx = ngx
 local get_request = base.get_request
 local type = type
@@ -49,29 +51,30 @@ if subsystem == 'http' then
  _M.register_ngx_magic_key_setter = register_setter
 
 
- local mt = getmetatable(ngx)
+ local mt = new_tab(0, 2)
 
 
- local old_index = mt.__index
  mt.__index = function (tb, key)
  local f = ngx_magic_key_getters[key]
  if f then
  return f()
  end
- return old_index(tb, key)
+ return rawget(tb, key)
  end
 
 
- local old_newindex = mt.__newindex
  mt.__newindex = function (tb, key, ctx)
  local f = ngx_magic_key_setters[key]
  if f then
  return f(ctx)
  end
- return old_newindex(tb, key, ctx)
+ return rawset(tb, key, ctx)
  end
 
 
+ setmetatable(ngx, mt)
+
+
  ffi.cdef[[
 int ngx_http_lua_ffi_get_resp_status(ngx_http_request_t *r);
 int ngx_http_lua_ffi_set_resp_status(ngx_http_request_t *r, int r);

lib/resty/core/ndk.lua

@@ -11,9 +11,10 @@ local ffi_cast = ffi.cast
 local ffi_new = ffi.new
 local ffi_str = ffi.string
 local FFI_OK = base.FFI_OK
+local new_tab = base.new_tab
 local get_string_buf = base.get_string_buf
 local get_request = base.get_request
-local getmetatable = getmetatable
+local setmetatable = setmetatable
 local type = type
 local tostring = tostring
 local error = error
@@ -79,12 +80,12 @@ local function ndk_set_var_set()
 end
 
 
-do
- if ndk then
-  local mt = getmetatable(ndk.set_var)
-  mt.__newindex = ndk_set_var_set
- mt.__index = ndk_set_var_get
- end
+if ndk then
+ local mt = new_tab(0, 2)
+ mt.__newindex = ndk_set_var_set
+ mt.__index = ndk_set_var_get
+
+ ndk.set_var = setmetatable(new_tab(0, 0), mt)
 end
 
 

lib/resty/core/regex.lua

@@ -40,9 +40,7 @@ local _M = {
 }
 
 
-if not ngx.re then
- ngx.re = {}
-end
+ngx.re = new_tab(0, 5)
 
 
 ffi.cdef[[

lib/resty/core/response.lua

@@ -13,7 +13,7 @@ local FFI_BAD_CONTEXT = base.FFI_BAD_CONTEXT
 local FFI_NO_REQ_CTX = base.FFI_NO_REQ_CTX
 local FFI_DECLINED = base.FFI_DECLINED
 local get_string_buf = base.get_string_buf
-local getmetatable = getmetatable
+local setmetatable = setmetatable
 local type = type
 local tostring = tostring
 local get_request = base.get_request
@@ -172,9 +172,11 @@ end
 
 
 do
- local mt = getmetatable(ngx.header)
+ local mt = new_tab(0, 2)
  mt.__newindex = set_resp_header
  mt.__index = get_resp_header
+
+ ngx.header = setmetatable(new_tab(0, 0), mt)
 end
 
 

lib/resty/core/shdict.lua

@@ -4,6 +4,17 @@
 local ffi = require 'ffi'
 local base = require "resty.core.base"
 
+
+local _M = {
+ version = base.version
+}
+
+local ngx_shared = ngx.shared
+if not ngx_shared then
+ return _M
+end
+
+
 local ffi_new = ffi.new
 local ffi_str = ffi.string
 local C = ffi.C
@@ -15,7 +26,6 @@ local tostring = tostring
 local next = next
 local type = type
 local error = error
-local ngx_shared = ngx.shared
 local getmetatable = getmetatable
 local FFI_DECLINED = base.FFI_DECLINED
 local subsystem = ngx.config.subsystem
@@ -600,33 +610,29 @@ else
 end
 
 
-if ngx_shared then
- local _, dict = next(ngx_shared, nil)
- if dict then
- local mt = getmetatable(dict)
+local _, dict = next(ngx_shared, nil)
+if dict then
+ local mt = getmetatable(dict)
+ if mt then
+ mt = mt.__index
  if mt then
- mt = mt.__index
- if mt then
- mt.get = shdict_get
- mt.get_stale = shdict_get_stale
- mt.incr = shdict_incr
- mt.set = shdict_set
- mt.safe_set = shdict_safe_set
- mt.add = shdict_add
- mt.safe_add = shdict_safe_add
- mt.replace = shdict_replace
- mt.delete = shdict_delete
- mt.flush_all = shdict_flush_all
- mt.ttl = shdict_ttl
- mt.expire = shdict_expire
- mt.capacity = shdict_capacity
- mt.free_space = shdict_free_space
- end
+ mt.get = shdict_get
+ mt.get_stale = shdict_get_stale
+ mt.incr = shdict_incr
+ mt.set = shdict_set
+ mt.safe_set = shdict_safe_set
+ mt.add = shdict_add
+ mt.safe_add = shdict_safe_add
+ mt.replace = shdict_replace
+ mt.delete = shdict_delete
+ mt.flush_all = shdict_flush_all
+ mt.ttl = shdict_ttl
+ mt.expire = shdict_expire
+ mt.capacity = shdict_capacity
+ mt.free_space = shdict_free_space
  end
  end
 end
 
 
-return {
- version = base.version
-}
+return _M

lib/resty/core/var.lua

@@ -11,14 +11,17 @@ local type = type
 local get_request = base.get_request
 local get_string_buf = base.get_string_buf
 local get_size_ptr = base.get_size_ptr
+local new_tab = base.new_tab
 local error = error
 local tostring = tostring
-local ngx_var = ngx.var
-local getmetatable = getmetatable
+local setmetatable = setmetatable
 
 local ERR_BUF_SIZE = 256
 
 
+ngx.var = new_tab(0, 0)
+
+
 ffi.cdef[[
  int ngx_http_lua_ffi_var_get(ngx_http_request_t *r,
  const char *name_data, size_t name_len, char *lowcase_buf,
@@ -116,12 +119,12 @@ local function var_set(self, name, value)
 end
 
 
-if ngx_var then
- local mt = getmetatable(ngx_var)
- if mt then
-  mt.__index = var_get
- mt.__newindex = var_set
- end
+do
+ local mt = new_tab(0, 2)
+ mt.__index = var_get
+ mt.__newindex = var_set
+
+ setmetatable(ngx.var, mt)
 end
 
 

lib/resty/core/worker.lua

@@ -6,6 +6,10 @@ local base = require "resty.core.base"
 
 
 local C = ffi.C
+local new_tab = base.new_tab
+
+
+ngx.worker = new_tab(0, 4)
 
 
 ffi.cdef[[

t/os-getenv.t

@@ -2,7 +2,7 @@
 use lib '.';
 use t::TestCore;
 
-plan tests => repeat_each() * (blocks() * 3 + 2);
+plan tests => repeat_each() * (blocks() * 3 + 1);
 
 add_block_preprocessor(sub {
  my $block = shift;
@@ -180,85 +180,40 @@ in content:\s+
 
 
 === TEST 8: os.getenv() overwrite is reverted in worker phases
---- http_config
- lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
- lua_load_resty_core off;
-
- init_by_lua_block {
- package.loaded.os_getenv = os.getenv
- require "resty.core"
- package.loaded.is_os_getenv = os.getenv == package.loaded.os_getenv
- }
---- config
-location /t {
- content_by_lua_block {
- os.getenv("")
-
- ngx.say("in init: ", package.loaded.is_os_getenv, "\n",
- "in content: ", os.getenv == package.loaded.os_getenv)
- }
-}
---- response_body
-in init: false
-in content: true
-
-
-
-=== TEST 9: os.getenv() can be localized before loading resty.core
 --- main_config
 env FOO=hello;
 --- http_config
  lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
- lua_load_resty_core off;
 
  init_by_lua_block {
- package.loaded.os_getenv = os.getenv
- require "resty.core"
-
- do
- local getenv = os.getenv
-
- package.loaded.f = function ()
- ngx.log(ngx.NOTICE, "FOO: ", getenv("FOO"))
- end
- end
-
- package.loaded.f()
-
- package.loaded.is_os_getenv = os.getenv == package.loaded.os_getenv
+ package.loaded.init_os_getenv = os.getenv
  }
 --- config
 location /t {
  content_by_lua_block {
- package.loaded.f()
- package.loaded.f()
+ ngx.say("FOO=", os.getenv("FOO"))
+
+ if os.getenv ~= package.loaded.init_os_getenv then
+ ngx.say("os.getenv() overwrite was reverted")
 
- ngx.say("in init: ", package.loaded.is_os_getenv, "\n",
- "in content: ", os.getenv == package.loaded.os_getenv)
+ else
+ ngx.say("os.getenv() overwrite was not reverted")
+ end
  }
 }
 --- response_body
-in init: false
-in content: true
---- grep_error_log eval
-qr/FOO: [a-z]+/
---- grep_error_log_out
-FOO: hello
-FOO: hello
-FOO: hello
+FOO=hello
+os.getenv() overwrite was reverted
 
 
 
-=== TEST 10: os.getenv() can be localized after loading resty.core
+=== TEST 9: os.getenv() can be localized after loading resty.core
 --- main_config
 env FOO=hello;
 --- http_config
  lua_package_path "$TEST_NGINX_LUA_PACKAGE_PATH";
- lua_load_resty_core off;
 
  init_by_lua_block {
- package.loaded.os_getenv = os.getenv
-
  do
  local getenv = os.getenv
 
@@ -279,16 +234,19 @@ location /t {
  package.loaded.f()
  package.loaded.f()
 
- ngx.say("in init: ", package.loaded.is_os_getenv, "\n",
- "in content: ", os.getenv == package.loaded.os_getenv)
+ if os.getenv ~= package.loaded.init_os_getenv then
+ ngx.say("os.getenv() overwrite was reverted")
+
+ else
+ ngx.say("os.getenv() overwrite was not reverted")
+ end
  }
 }
 --- response_body
-in init: false
-in content: false
+os.getenv() overwrite was reverted
 --- grep_error_log eval
 qr/FOO: [a-z]+/
 --- grep_error_log_out
-FOO: nil
+FOO: hello
 FOO: hello
 FOO: hello