feature: add api in shdict: lpush, lpop, rpush, rpop, llen #586

doujiang24 · 2015-10-28T10:51:52Z

I'm not sure if it is an good idea to get the list queue head in the way:

#define ngx_http_lua_shdict_get_list_head(sd, key_len)                      \
    (ngx_queue_t *) ngx_align_ptr(((u_char *) &sd->data + key_len),         \
                                  NGX_ALIGNMENT)

Anything not suitable, let me know, thanks :)

agentzh · 2015-10-28T12:00:29Z

src/ngx_http_lua_shdict.c

+}
+
+
+


Style: 2 blank lines needed instead of 3.

agentzh · 2015-10-28T12:10:11Z

@doujiang24 The feature implemented in this PR is awesome. I'll have a closer look as soon as I can manage (need to cut a new OpenResty release ASAP).

bungle · 2015-10-28T12:24:55Z

Yes, this is great, thanks @doujiang24. I was going to look at implementing just one thing, as discussed in #552, but you went ahead and implemented a lot more of these. Maybe when you are up to the speed with this, you can also take a look at implementing ttl ( expire's cousin, :-) )?

doujiang24 · 2015-10-29T02:57:50Z

@agentzh Thanks for your review :)
I just fixed some code style and a stupid bug.

doujiang24 · 2015-10-29T03:42:29Z

@bungle Thanks, I tried to implement ttl and type api, but it brought some duplicated codes. I haven't come up with an idea to fix it. I'll try again later after this PR is merged :)

thibaultcha · 2015-11-12T20:19:28Z

Wow, that is really nice! Good job.

dualface · 2016-01-01T17:33:20Z

+1

guanglinlv · 2016-01-18T01:14:07Z

++1

agentzh · 2016-07-27T20:45:45Z

src/ngx_http_lua_shdict.c



 enum {
    SHDICT_USERDATA_INDEX = 1,
 };


+#define ngx_http_lua_shdict_get_list_head(sd, key_len)                      \


Shall we use an inline function here instead of a macro? Thanks!

agentzh · 2016-07-30T21:36:41Z

@doujiang24 Will you please rebase it to the latest master branch? Thanks!

agentzh · 2016-07-30T21:37:31Z

src/ngx_http_lua_shdict.c

+
+        lua_pushnumber(L, (lua_Number) sd->value_len);
+
+        ngx_shmtx_unlock(&ctx->shpool->mutex);


Better put ngx_shmtx_unlock() before lua_pushnumber() because the latter might throw. Thanks!

agentzh · 2016-07-30T21:42:03Z

src/ngx_http_lua_shdict.c


-            p = ngx_copy(sd->data, key, key_len);
-            ngx_memcpy(p, str_value_buf, str_value_len);
+    } else if (rc == NGX_OK) {


�I don't think we need an else here since the previous branch always jumps away via goto push_node, right?

agentzh · 2016-07-30T21:56:45Z

It seems to me that the expire method is irrelevant to the rest of the changes in this PR. I think it's better to move it to a separate PR to simplify the review and merge work. What do you think? I prefer small and self-contained PRs over mixed ones.

…g Lua's types

…t_get_list_head

doujiang24 · 2016-08-02T14:53:02Z

@agentzh Thanks for your review :)
All fixed and the expire method may be another PR after this PR merged :)

agentzh · 2016-08-02T23:35:05Z

src/ngx_http_lua_shdict.c

@@ -1534,7 +2206,7 @@ ngx_http_lua_find_zone(u_char *name_data, size_t name_len)
        if (name->len == name_len
            && ngx_strncmp(name->data, name_data, name_len) == 0)
        {
-            return &zone[i];
+            return zone;


I'm afraid this change is wrong and bad.

Sorry, this may be something wrong from rebase :(
I have rechecked the left change :)

agentzh · 2016-08-08T19:18:33Z

Merged into master already.

agentzh reviewed Oct 28, 2015
View reviewed changes

src/ngx_http_lua_shdict.c

}

Copy link

Member

agentzh Oct 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Style: 2 blank lines needed instead of 3.

doujiang24 force-pushed the shdict_list branch from ebb8f5c to 5b8387e Compare November 24, 2015 04:09

doujiang24 mentioned this pull request Jan 4, 2016

Incr method exptime openresty/lua-resty-core#10

Open

splitice mentioned this pull request Jan 4, 2016

ngx.shared.DICT.incr optional expire argument #358

Closed

agentzh force-pushed the master branch 2 times, most recently from e7ac10c to cfd4f90 Compare January 31, 2016 19:04

agentzh mentioned this pull request May 18, 2016

tcpsock:setkeepalive #664

Closed

agentzh reviewed Jul 27, 2016
View reviewed changes

doujiang24 force-pushed the shdict_list branch from 5b8387e to cd483ec Compare July 28, 2016 14:59

agentzh reviewed Jul 30, 2016
View reviewed changes

doujiang24 added 6 commits August 2, 2016 18:42

feature: add api in shdict: lpush, lpop, rpush, rpop, llen, expire

224891d

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

4cdb80d

some code style fix & use selfdefine type constants instead of abusin…

ffbfe17

…g Lua's types

use an inline function here instead of a macro for ngx_http_lua_shdic…

7345b93

…t_get_list_head

fix test case: shdict count

2683c4d

some doc fix and bugfix

3eb0be9

doujiang24 force-pushed the shdict_list branch from 1c828f1 to 3eb0be9 Compare August 2, 2016 10:42

doujiang24 added 4 commits August 2, 2016 18:53

some code style fix

21a2287

rename queue to lru_queue in ngx_http_lua_shdict_shctx_t

04d42ba

remove expire implement

0144d57

remove expire doc

46a25b3

agentzh changed the title ~~feature: add api in shdict: lpush, lpop, rpush, rpop, llen, expire~~ feature: add api in shdict: lpush, lpop, rpush, rpop, llen Aug 2, 2016

agentzh reviewed Aug 2, 2016
View reviewed changes

bugfix: maybe something wrong from rebase

f23de0b

agentzh closed this Aug 8, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: add api in shdict: lpush, lpop, rpush, rpop, llen #586

feature: add api in shdict: lpush, lpop, rpush, rpop, llen #586

doujiang24 commented Oct 28, 2015

agentzh Oct 28, 2015

agentzh commented Oct 28, 2015

bungle commented Oct 28, 2015

doujiang24 commented Oct 29, 2015

doujiang24 commented Oct 29, 2015

thibaultcha commented Nov 12, 2015

dualface commented Jan 1, 2016

guanglinlv commented Jan 18, 2016

agentzh Jul 27, 2016

agentzh commented Jul 30, 2016

agentzh Jul 30, 2016

agentzh Jul 30, 2016

agentzh commented Jul 30, 2016

doujiang24 commented Aug 2, 2016

agentzh Aug 2, 2016

doujiang24 Aug 3, 2016

agentzh commented Aug 8, 2016


		lua_pushnumber(L, (lua_Number) sd->value_len);

		ngx_shmtx_unlock(&ctx->shpool->mutex);

feature: add api in shdict: lpush, lpop, rpush, rpop, llen #586

feature: add api in shdict: lpush, lpop, rpush, rpop, llen #586

Conversation

doujiang24 commented Oct 28, 2015

agentzh Oct 28, 2015

Choose a reason for hiding this comment

agentzh commented Oct 28, 2015

bungle commented Oct 28, 2015

doujiang24 commented Oct 29, 2015

doujiang24 commented Oct 29, 2015

thibaultcha commented Nov 12, 2015

dualface commented Jan 1, 2016

guanglinlv commented Jan 18, 2016

agentzh Jul 27, 2016

Choose a reason for hiding this comment

agentzh commented Jul 30, 2016

agentzh Jul 30, 2016

Choose a reason for hiding this comment

agentzh Jul 30, 2016

Choose a reason for hiding this comment

agentzh commented Jul 30, 2016

doujiang24 commented Aug 2, 2016

agentzh Aug 2, 2016

Choose a reason for hiding this comment

doujiang24 Aug 3, 2016

Choose a reason for hiding this comment

agentzh commented Aug 8, 2016