code style fix & bugfix: use the wrong length for create list node

Author: doujiang24

README.markdown

@@ -5878,7 +5878,7 @@ ngx.shared.DICT.lpush
 
 **context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
 
-Insert the specified (numerical or string) `value` at the head of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns the length of the list after the push operations.
+Inserts the specified (numerical or string) `value` at the head of the list named `key` in the shm-based dictionary [ngx.shared.DICT](#ngxshareddict). Returns the length of the list after the push operations.
 
 If `key` does not exist, it is created as empty list before performing the push operations. When key holds a value that is not a list, it will return `nil` and `"wrongtype operation"`.
 
@@ -5896,7 +5896,7 @@ ngx.shared.DICT.rpush
 
 **context:** *init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, ngx.timer.**
 
-Similar to the [lpush](#ngxshareddictlpush) method, but insert the specified (numerical or string) `value` at the tail of the list named `key`.
+Similar to the [lpush](#ngxshareddictlpush) method, but inserts the specified (numerical or string) `value` at the tail of the list named `key`.
 
 This feature was first introduced in the `v0.*.*` release.
 

doc/HttpLuaModule.wiki

@@ -4911,7 +4911,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 '''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
 
-Insert the specified (numerical or string) <code>value</code> at the head of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns the length of the list after the push operations.
+Inserts the specified (numerical or string) <code>value</code> at the head of the list named <code>key</code> in the shm-based dictionary [[#ngx.shared.DICT|ngx.shared.DICT]]. Returns the length of the list after the push operations.
 
 If <code>key</code> does not exist, it is created as empty list before performing the push operations. When key holds a value that is not a list, it will return <code>nil</code> and <code>"wrongtype operation"</code>.
 
@@ -4926,7 +4926,7 @@ See also [[#ngx.shared.DICT|ngx.shared.DICT]].
 
 '''context:''' ''init_by_lua*, set_by_lua*, rewrite_by_lua*, access_by_lua*, content_by_lua*, header_filter_by_lua*, body_filter_by_lua*, log_by_lua*, ngx.timer.*''
 
-Similar to the [[#ngx.shared.DICT.lpush|lpush]] method, but insert the specified (numerical or string) <code>value</code> at the tail of the list named <code>key</code>.
+Similar to the [[#ngx.shared.DICT.lpush|lpush]] method, but inserts the specified (numerical or string) <code>value</code> at the tail of the list named <code>key</code>.
 
 This feature was first introduced in the <code>v0.*.*</code> release.
 

src/ngx_http_lua_shdict.c

@@ -301,8 +301,8 @@ ngx_http_lua_shdict_expire(ngx_http_lua_shdict_ctx_t *ctx, ngx_uint_t n)
             list_queue = ngx_http_lua_shdict_get_list_head(sd, sd->key_len);
 
             for (lq = ngx_queue_head(list_queue);
-                lq != ngx_queue_sentinel(list_queue);
-                lq = ngx_queue_next(lq))
+                 lq != ngx_queue_sentinel(list_queue);
+                 lq = ngx_queue_next(lq))
             {
                 lnode = ngx_queue_data(lq, ngx_http_lua_shdict_list_node_t,
                                        queue);
@@ -543,6 +543,7 @@ ngx_http_lua_shdict_get_helper(lua_State *L, int get_stale)
     value.len = (size_t) sd->value_len;
 
     switch (value_type) {
+
     case LUA_TSTRING:
 
         lua_pushlstring(L, (char *) value.data, value.len);
@@ -745,8 +746,8 @@ ngx_http_lua_shdict_flush_expired(lua_State *L)
                 list_queue = ngx_http_lua_shdict_get_list_head(sd, sd->key_len);
 
                 for (lq = ngx_queue_head(list_queue);
-                    lq != ngx_queue_sentinel(list_queue);
-                    lq = ngx_queue_next(lq))
+                     lq != ngx_queue_sentinel(list_queue);
+                     lq = ngx_queue_next(lq))
                 {
                     lnode = ngx_queue_data(lq, ngx_http_lua_shdict_list_node_t,
                                            queue);
@@ -980,6 +981,7 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
     value_type = lua_type(L, 3);
 
     switch (value_type) {
+
     case LUA_TSTRING:
         value.data = (u_char *) lua_tolstring(L, 3, &value.len);
         break;
@@ -1081,7 +1083,8 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
 
 replace:
 
-        if (value.data && value.len == (size_t) sd->value_len
+        if (value.data
+            && value.len == (size_t) sd->value_len
             && sd->value_type != LUA_TTABLE)
         {
 
@@ -1132,8 +1135,8 @@ ngx_http_lua_shdict_set_helper(lua_State *L, int flags)
             queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
 
             for (q = ngx_queue_head(queue);
-                q != ngx_queue_sentinel(queue);
-                q = ngx_queue_next(q))
+                 q != ngx_queue_sentinel(queue);
+                 q = ngx_queue_next(q))
             {
                 p = (u_char *) ngx_queue_data(q,
                                               ngx_http_lua_shdict_list_node_t,
@@ -1399,6 +1402,7 @@ ngx_http_lua_shared_dict_get(ngx_shm_zone_t *zone, u_char *key_data,
     len = (size_t) sd->value_len;
 
     switch (value->type) {
+
     case LUA_TSTRING:
 
         if (value->value.s.data == NULL || value->value.s.len == 0) {
@@ -1534,6 +1538,7 @@ ngx_http_lua_shdict_push_helper(lua_State *L, int flags)
     value_type = lua_type(L, 3);
 
     switch (value_type) {
+
     case LUA_TSTRING:
         value.data = (u_char *) lua_tolstring(L, 3, &value.len);
         break;
@@ -1594,8 +1599,8 @@ ngx_http_lua_shdict_push_helper(lua_State *L, int flags)
         queue = ngx_http_lua_shdict_get_list_head(sd, key.len);
 
         for (q = ngx_queue_head(queue);
-            q != ngx_queue_sentinel(queue);
-            q = ngx_queue_next(q))
+             q != ngx_queue_sentinel(queue);
+             q = ngx_queue_next(q))
         {
             /* TODO: reuse matched size list node */
             lnode = ngx_queue_data(q, ngx_http_lua_shdict_list_node_t, queue);
@@ -1686,11 +1691,12 @@ ngx_http_lua_shdict_push_helper(lua_State *L, int flags)
     ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ctx->log, 0,
                    "lua shared dict list: creating a new list node");
 
-    n = sizeof(ngx_http_lua_shdict_list_node_t)
+    n = offsetof(ngx_http_lua_shdict_list_node_t, data)
         + value.len;
 
-    lnode = ngx_slab_alloc_locked(ctx->shpool,
-                                  sizeof(ngx_http_lua_shdict_list_node_t));
+    dd("list node length: %d", n);
+
+    lnode = ngx_slab_alloc_locked(ctx->shpool, n);
 
     if (lnode == NULL) {
 
@@ -1759,7 +1765,6 @@ ngx_http_lua_shdict_rpop(lua_State *L)
 }
 
 
-
 static int
 ngx_http_lua_shdict_pop_helper(lua_State *L, int flags)
 {
@@ -1873,6 +1878,7 @@ ngx_http_lua_shdict_pop_helper(lua_State *L, int flags)
     value.len = (size_t) lnode->value_len;
 
     switch (value_type) {
+
     case LUA_TSTRING:
 
         lua_pushlstring(L, (char *) value.data, value.len);
@@ -2184,6 +2190,7 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
     hash = ngx_crc32_short(key, key_len);
 
     switch (value_type) {
+
     case LUA_TSTRING:
         /* do nothing */
         break;
@@ -2232,6 +2239,7 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
             *errmsg = "not found";
             return NGX_DECLINED;
         }
+
         /* rc == NGX_OK */
 
         goto replace;
@@ -2266,7 +2274,8 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
 
 replace:
 
-        if (str_value_buf && str_value_len == (size_t) sd->value_len
+        if (str_value_buf
+            && str_value_len == (size_t) sd->value_len
             && sd->value_type != LUA_TTABLE)
         {
 
@@ -2315,8 +2324,8 @@ ngx_http_lua_ffi_shdict_store(ngx_shm_zone_t *zone, int op, u_char *key,
             queue = ngx_http_lua_shdict_get_list_head(sd, key_len);
 
             for (q = ngx_queue_head(queue);
-                q != ngx_queue_sentinel(queue);
-                q = ngx_queue_next(q))
+                 q != ngx_queue_sentinel(queue);
+                 q = ngx_queue_next(q))
             {
                 p = (u_char *) ngx_queue_data(q,
                                               ngx_http_lua_shdict_list_node_t,
@@ -2493,6 +2502,7 @@ ngx_http_lua_ffi_shdict_get(ngx_shm_zone_t *zone, u_char *key,
     }
 
     switch (*value_type) {
+
     case LUA_TSTRING:
         *str_value_len = value.len;
         ngx_memcpy(*str_value_buf, value.data, value.len);

src/ngx_http_lua_shdict.h

@@ -25,9 +25,9 @@ typedef struct {
 
 
 typedef struct {
-    uint8_t                      value_type;
-    uint32_t                     value_len;
     ngx_queue_t                  queue;
+    uint32_t                     value_len;
+    uint8_t                      value_type;
     u_char                       data[1];
 } ngx_http_lua_shdict_list_node_t;
 

t/133-shdict-list.t

@@ -678,3 +678,39 @@ keys number: 0
 --- no_error_log
 [error]
 
+
+
+=== TEST 17: long list node
+--- http_config
+    lua_shared_dict dogs 1m;
+--- config
+    location = /test {
+        content_by_lua_block {
+            local dogs = ngx.shared.dogs
+
+            local long_str = string.rep("foo", 10)
+
+            for i = 1, 3 do
+                local len, err = dogs:lpush("list", long_str)
+                if not len then
+                    ngx.say("push err: ", err)
+                end
+            end
+
+            for i = 1, 3 do
+                local val, err = dogs:lpop("list")
+                if val then
+                    ngx.say(val)
+                end
+            end
+        }
+    }
+--- request
+GET /test
+--- response_body
+foofoofoofoofoofoofoofoofoofoo
+foofoofoofoofoofoofoofoofoofoo
+foofoofoofoofoofoofoofoofoofoo
+--- no_error_log
+[error]
+