Commit 3305306f authored by antirez's avatar antirez
Browse files

Initial implementation of EXPIRE

parent 300827b6
...@@ -6,7 +6,7 @@ DEBUG?= -g ...@@ -6,7 +6,7 @@ DEBUG?= -g
CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -DSDS_ABORT_ON_OOM CFLAGS?= -std=c99 -pedantic -O2 -Wall -W -DSDS_ABORT_ON_OOM
CCOPT= $(CFLAGS) CCOPT= $(CFLAGS)
OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o fastlz.o
BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o BENCHOBJ = ae.o anet.o benchmark.o sds.o adlist.o zmalloc.o
CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o
......
- GETSET - GETSET
- Fix pure-PHP lib for the new protocol
- keys expire - keys expire
- sunion ssub - sunion ssub
- network layer stresser in test in demo - network layer stresser in test in demo
......
...@@ -107,8 +107,8 @@ typedef struct dictIterator { ...@@ -107,8 +107,8 @@ typedef struct dictIterator {
#define dictGetEntryKey(he) ((he)->key) #define dictGetEntryKey(he) ((he)->key)
#define dictGetEntryVal(he) ((he)->val) #define dictGetEntryVal(he) ((he)->val)
#define dictGetHashTableSize(ht) ((ht)->size) #define dictSlots(ht) ((ht)->size)
#define dictGetHashTableUsed(ht) ((ht)->used) #define dictSize(ht) ((ht)->used)
/* API */ /* API */
dict *dictCreate(dictType *type, void *privDataPtr); dict *dictCreate(dictType *type, void *privDataPtr);
......
...@@ -102,6 +102,7 @@ static struct redisCommand cmdTable[] = { ...@@ -102,6 +102,7 @@ static struct redisCommand cmdTable[] = {
{"sort",-2,REDIS_CMD_INLINE}, {"sort",-2,REDIS_CMD_INLINE},
{"info",1,REDIS_CMD_INLINE}, {"info",1,REDIS_CMD_INLINE},
{"mget",-2,REDIS_CMD_INLINE}, {"mget",-2,REDIS_CMD_INLINE},
{"expire",3,REDIS_CMD_INLINE},
{NULL,0,0} {NULL,0,0}
}; };
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment