fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-02 07:41:04 +00:00
Code Issues Projects Releases Wiki Activity

Fixed MONITOR mode and Issue 296

Browse Source
This commit is contained in:
antirez 2010-08-30 11:51:45 +02:00
parent 8fedd04dcc
commit e0e1c19520
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/db.c
View File

@ -221,19 +221,19 @@ void keysCommand(redisClient *c) {
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
sds pattern = c->argv[1]->ptr; sds pattern = c->argv[1]->ptr;
int plen = sdslen(pattern); int plen = sdslen(pattern), allkeys;
unsigned long numkeys = 0; unsigned long numkeys = 0;
robj *lenobj = createObject(REDIS_STRING,NULL); robj *lenobj = createObject(REDIS_STRING,NULL);
di = dictGetIterator(c->db->dict); di = dictGetIterator(c->db->dict);
addReply(c,lenobj); addReply(c,lenobj);
decrRefCount(lenobj); decrRefCount(lenobj);
allkeys = (pattern[0] == '*' && pattern[1] == '\0');
while((de = dictNext(di)) != NULL) { while((de = dictNext(di)) != NULL) {
sds key = dictGetEntryKey(de); sds key = dictGetEntryKey(de);
robj *keyobj; robj *keyobj;
if ((pattern[0] == '*' && pattern[1] == '\0') || if (allkeys || stringmatchlen(pattern,plen,key,sdslen(key),0)) {
stringmatchlen(pattern,plen,key,sdslen(key),0)) {
keyobj = createStringObject(key,sdslen(key)); keyobj = createStringObject(key,sdslen(key));
if (expireIfNeeded(c->db,keyobj) == 0) { if (expireIfNeeded(c->db,keyobj) == 0) {
addReplyBulk(c,keyobj); addReplyBulk(c,keyobj);

5
src/redis-cli.c
View File

@ -96,7 +96,7 @@ static sds cliReadLine(int fd) {
ssize_t ret; ssize_t ret;
ret = read(fd,&c,1); ret = read(fd,&c,1);
if (ret == -1) { if (ret <= 0) {
sdsfree(line); sdsfree(line);
return NULL; return NULL;
} else if ((ret == 0) || (c == '\n')) { } else if ((ret == 0) || (c == '\n')) {
@ -282,7 +282,8 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
while(repeat--) { while(repeat--) {
anetWrite(fd,cmd,sdslen(cmd)); anetWrite(fd,cmd,sdslen(cmd));
while (config.monitor_mode) { while (config.monitor_mode) {
cliReadSingleLineReply(fd,0); if (cliReadSingleLineReply(fd,0)) exit(1);
printf("\n");
} }
if (config.pubsub_mode) { if (config.pubsub_mode) {