caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'unstable' of git://github.com/mihirvj/redis into set-pr

Browse Source
This commit is contained in:
antirez 2015-02-03 14:13:30 +01:00
commit 51010007bc
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/t_string.c
View File

@ -61,6 +61,8 @@ static int checkStringLength(redisClient *c, long long size) {
#define REDIS_SET_NO_FLAGS 0
#define REDIS_SET_NX (1<<0) /* Set if key not exists. */
#define REDIS_SET_XX (1<<1) /* Set if key exists. */
#define REDIS_SET_EX (1<<2) /* Set if time in seconds is given */
#define REDIS_SET_PX (1<<3) /* Set if time in ms in given */
void setGenericCommand(redisClient *c, int flags, robj *key, robj *val, robj *expire, int unit, robj *ok_reply, robj *abort_reply) {
long long milliseconds = 0; /* initialized to avoid any harmness warning */
@ -102,18 +104,24 @@ void setCommand(redisClient *c) {
robj *next = (j == c->argc-1) ? NULL : c->argv[j+1];
if ((a[0] == 'n' || a[0] == 'N') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0') {
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_XX)) {
flags |= REDIS_SET_NX;
} else if ((a[0] == 'x' || a[0] == 'X') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0') {
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_NX)) {
flags |= REDIS_SET_XX;
} else if ((a[0] == 'e' || a[0] == 'E') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' && next) {
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_PX) && next) {
flags |= REDIS_SET_EX;
unit = UNIT_SECONDS;
expire = next;
j++;
} else if ((a[0] == 'p' || a[0] == 'P') &&
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' && next) {
(a[1] == 'x' || a[1] == 'X') && a[2] == '\0' &&
!(flags & REDIS_SET_EX) && next) {
flags |= REDIS_SET_PX;
unit = UNIT_MILLISECONDS;
expire = next;
j++;