[incubator-apisix] branch master updated: chore: improve plugins/proxy-cache (#1305)

[membphis]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git


The following commit(s) were added to refs/heads/master by this push:
     new dcd2ebc  chore: improve plugins/proxy-cache (#1305)
dcd2ebc is described below

commit dcd2ebc5e4788d6d2e888538c0c8f1151091d0d9
Author: 罗泽轩 <spacewander...@gmail.com>
AuthorDate: Fri Mar 20 12:26:43 2020 +0800

    chore: improve plugins/proxy-cache (#1305)
    
    1. unit all the default cache time to 10s.
    2. remove repeated `if proxy_cache` check.
    3. improve `generate_complex_value`'s performance.
    4. better indent.
---
 bin/apisix                         |  2 +-
 lua/apisix/plugins/proxy-cache.lua | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/bin/apisix b/bin/apisix
index 6f0a0f1..2f27970 100755
--- a/bin/apisix
+++ b/bin/apisix
@@ -428,7 +428,7 @@ http {
             set $upstream_hdr_cache_control     '';
 
             proxy_cache                         $upstream_cache_zone;
-            proxy_cache_valid                   any {% if proxy_cache and 
proxy_cache.cache_ttl then %} {* proxy_cache.cache_ttl *} {% else %} 5s {% end 
%};
+            proxy_cache_valid                   any {% if 
proxy_cache.cache_ttl then %} {* proxy_cache.cache_ttl *} {% else %} 10s {% end 
%};
             proxy_cache_min_uses                1;
             proxy_cache_methods                 GET HEAD;
             proxy_cache_lock_timeout            5s;
diff --git a/lua/apisix/plugins/proxy-cache.lua 
b/lua/apisix/plugins/proxy-cache.lua
index 05c1f5a..7b95aba 100644
--- a/lua/apisix/plugins/proxy-cache.lua
+++ b/lua/apisix/plugins/proxy-cache.lua
@@ -17,7 +17,6 @@
 
 local core = require("apisix.core")
 local ngx_re = require("ngx.re")
-local tab_insert = table.insert
 local tab_concat = table.concat
 local string = string
 local io_open = io.open
@@ -134,10 +133,10 @@ local function generate_complex_value(data, ctx)
     for i, value in ipairs(data) do
         core.log.info("proxy-cache complex value index-", i, ": ", value)
 
-        if string.sub(value, 1, 1) == "$" then
-            tab_insert(tmp, ctx.var[string.sub(value, 2)])
+        if string.byte(value, 1, 1) == string.byte('$') then
+            tmp[i] = ctx.var[string.sub(value, 2)]
         else
-            tab_insert(tmp, value)
+            tmp[i] = value
         end
     end
 
@@ -175,7 +174,11 @@ end
 
 local function file_exists(name)
     local f = io_open(name, "r")
-    if f~=nil then io_close(f) return true else return false end
+    if f ~= nil then
+        io_close(f)
+        return true
+    end
+    return false
 end
 
 
@@ -186,12 +189,12 @@ local function generate_cache_filename(cache_path, 
cache_levels, cache_key)
 
     local index = string.len(md5sum)
     for k, v in pairs(levels) do
-            local length = tonumber(v)
-            index = index - length
-            filename = filename .. md5sum:sub(index+1, index+length) .. "/"
+        local length = tonumber(v)
+        index = index - length
+        filename = filename .. md5sum:sub(index+1, index+length) .. "/"
     end
     if cache_path:sub(-1) ~= "/" then
-            cache_path = cache_path .. "/"
+        cache_path = cache_path .. "/"
     end
     filename = cache_path .. filename .. md5sum
     return filename