gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use __attribute__ format in sdscatprintf() when the compiler is GCC. Fixed format bugs resulting from the new warnings.

Browse Source
This commit is contained in:
antirez 2009-12-05 13:50:36 +01:00
parent 09f6f70209
commit 682ac7248a
3 changed files with 45 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
TODO
View File

@ -49,15 +49,22 @@ SHORT/LONG TERM RANDOM TODO ITEMS
Most of this can be seen just as proposals, the fact they are in this list Most of this can be seen just as proposals, the fact they are in this list
it's not a guarantee they'll ever get implemented ;) it's not a guarantee they'll ever get implemented ;)
* FORK command (fork()s executing the commands received by the current * FORK command (fork()s executing the commands received by the current
client in the new process). Hint: large SORTs can use more cores, client in the new process). Hint: large SORTs can use more cores,
copy-on-write will avoid memory problems. copy-on-write will avoid memory problems.
* DUP command? DUP srckey dstkey, creates an exact clone of srckey value in dstkey. * DUP command? DUP srckey dstkey, creates an exact clone of srckey value in dstkey.
* SORT: Don't copy the list into a vector when BY argument is constant. * SORT: Don't copy the list into a vector when BY argument is constant.
* Write the hash table size of every db in the dump, so that Redis can resize the hash table just one time when loading a big DB. * Write the hash table size of every db in the dump, so that Redis can resize the hash table just one time when loading a big DB.
* LOCK / TRYLOCK / UNLOCK as described many times in the google group * LOCK / TRYLOCK / UNLOCK as described many times in the google group
* Replication automated tests * Replication automated tests
* Byte Array type (BA prefixed commands): BASETBIT BAGETBIT BASETU8 U16 U32 U64 S8 S16 S32 S64, ability to atomically INCRBY all the base types. BARANGE to get a range of bytes as a bulk value, BASETRANGE to set a range of bytes. * Byte Array type (BA prefixed commands): BASETBIT BAGETBIT BASETU8 U16 U32 U64 S8 S16 S32 S64, ability to atomically INCRBY all the base types. BARANGE to get a range of bytes as a bulk value, BASETRANGE to set a range of bytes.
* zmalloc() should avoid to add a private header for archs where there is some other kind of libc-specific way to get the size of a malloced block. Already done for Mac OS X. * zmalloc() should avoid to add a private header for archs where there is some other kind of libc-specific way to get the size of a malloced block. Already done for Mac OS X.
* Read-only mode. * Read-only mode.
* Pattern-matching replication. * Pattern-matching replication.
DOCUMENTATION WISHLIST
======================
* Page explaining tips to reduce memory usage.
* A Sorted sets HOWTO

37
redis.c
View File

@ -1802,7 +1802,7 @@ static void replicationFeedSlaves(list *slaves, struct redisCommand *cmd, int di
robj *lenobj; robj *lenobj;
lenobj = createObject(REDIS_STRING, lenobj = createObject(REDIS_STRING,
sdscatprintf(sdsempty(),"%d\r\n", sdscatprintf(sdsempty(),"%lu\r\n",
stringObjectLen(argv[j]))); stringObjectLen(argv[j])));
lenobj->refcount = 0; lenobj->refcount = 0;
outv[outc++] = lenobj; outv[outc++] = lenobj;
@ -2019,7 +2019,7 @@ static void addReplyDouble(redisClient *c, double d) {
char buf[128]; char buf[128];
snprintf(buf,sizeof(buf),"%.17g",d); snprintf(buf,sizeof(buf),"%.17g",d);
addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n%s\r\n", addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n%s\r\n",
strlen(buf),buf)); strlen(buf),buf));
} }
@ -2040,7 +2040,7 @@ static void addReplyBulkLen(redisClient *c, robj *obj) {
len++; len++;
} }
} }
addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n",len)); addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",len));
} }
static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) { static void acceptHandler(aeEventLoop *el, int fd, void *privdata, int mask) {
@ -3214,7 +3214,7 @@ static void keysCommand(redisClient *c) {
dictEntry *de; dictEntry *de;
sds pattern = c->argv[1]->ptr; sds pattern = c->argv[1]->ptr;
int plen = sdslen(pattern); int plen = sdslen(pattern);
int numkeys = 0, keyslen = 0; unsigned long numkeys = 0, keyslen = 0;
robj *lenobj = createObject(REDIS_STRING,NULL); robj *lenobj = createObject(REDIS_STRING,NULL);
di = dictGetIterator(c->db->dict); di = dictGetIterator(c->db->dict);
@ -3871,7 +3871,7 @@ static void scardCommand(redisClient *c) {
addReply(c,shared.wrongtypeerr); addReply(c,shared.wrongtypeerr);
} else { } else {
s = o->ptr; s = o->ptr;
addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n", addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",
dictSize(s))); dictSize(s)));
} }
} }
@ -3936,12 +3936,12 @@ static int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
return dictSize(*d1)-dictSize(*d2); return dictSize(*d1)-dictSize(*d2);
} }
static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, robj *dstkey) { static void sinterGenericCommand(redisClient *c, robj **setskeys, unsigned long setsnum, robj *dstkey) {
dict **dv = zmalloc(sizeof(dict*)*setsnum); dict **dv = zmalloc(sizeof(dict*)*setsnum);
dictIterator *di; dictIterator *di;
dictEntry *de; dictEntry *de;
robj *lenobj = NULL, *dstset = NULL; robj *lenobj = NULL, *dstset = NULL;
int j, cardinality = 0; unsigned long j, cardinality = 0;
for (j = 0; j < setsnum; j++) { for (j = 0; j < setsnum; j++) {
robj *setobj; robj *setobj;
@ -4018,9 +4018,9 @@ static void sinterGenericCommand(redisClient *c, robj **setskeys, int setsnum, r
} }
if (!dstkey) { if (!dstkey) {
lenobj->ptr = sdscatprintf(sdsempty(),"*%d\r\n",cardinality); lenobj->ptr = sdscatprintf(sdsempty(),"*%lu\r\n",cardinality);
} else { } else {
addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n", addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",
dictSize((dict*)dstset->ptr))); dictSize((dict*)dstset->ptr)));
server.dirty++; server.dirty++;
} }
@ -4122,7 +4122,7 @@ static void sunionDiffGenericCommand(redisClient *c, robj **setskeys, int setsnu
if (!dstkey) { if (!dstkey) {
decrRefCount(dstset); decrRefCount(dstset);
} else { } else {
addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n", addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",
dictSize((dict*)dstset->ptr))); dictSize((dict*)dstset->ptr)));
server.dirty++; server.dirty++;
} }
@ -4650,7 +4650,7 @@ static void zcardCommand(redisClient *c) {
addReply(c,shared.wrongtypeerr); addReply(c,shared.wrongtypeerr);
} else { } else {
zs = o->ptr; zs = o->ptr;
addReplySds(c,sdscatprintf(sdsempty(),":%d\r\n",zs->zsl->length)); addReplySds(c,sdscatprintf(sdsempty(),":%lu\r\n",zs->zsl->length));
} }
} }
} }
@ -5068,14 +5068,14 @@ static sds genRedisInfoString(void) {
"redis_version:%s\r\n" "redis_version:%s\r\n"
"arch_bits:%s\r\n" "arch_bits:%s\r\n"
"multiplexing_api:%s\r\n" "multiplexing_api:%s\r\n"
"uptime_in_seconds:%d\r\n" "uptime_in_seconds:%ld\r\n"
"uptime_in_days:%d\r\n" "uptime_in_days:%ld\r\n"
"connected_clients:%d\r\n" "connected_clients:%d\r\n"
"connected_slaves:%d\r\n" "connected_slaves:%d\r\n"
"used_memory:%zu\r\n" "used_memory:%zu\r\n"
"changes_since_last_save:%lld\r\n" "changes_since_last_save:%lld\r\n"
"bgsave_in_progress:%d\r\n" "bgsave_in_progress:%d\r\n"
"last_save_time:%d\r\n" "last_save_time:%ld\r\n"
"total_connections_received:%lld\r\n" "total_connections_received:%lld\r\n"
"total_commands_processed:%lld\r\n" "total_commands_processed:%lld\r\n"
"role:%s\r\n" "role:%s\r\n"
@ -5122,7 +5122,7 @@ static sds genRedisInfoString(void) {
static void infoCommand(redisClient *c) { static void infoCommand(redisClient *c) {
sds info = genRedisInfoString(); sds info = genRedisInfoString();
addReplySds(c,sdscatprintf(sdsempty(),"$%d\r\n",sdslen(info))); addReplySds(c,sdscatprintf(sdsempty(),"$%lu\r\n",sdslen(info)));
addReplySds(c,info); addReplySds(c,info);
addReply(c,shared.crlf); addReply(c,shared.crlf);
} }
@ -5664,7 +5664,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
char seldb[64]; char seldb[64];
snprintf(seldb,sizeof(seldb),"%d",dictid); snprintf(seldb,sizeof(seldb),"%d",dictid);
buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%d\r\n%s\r\n", buf = sdscatprintf(buf,"*2\r\n$6\r\nSELECT\r\n$%lu\r\n%s\r\n",
strlen(seldb),seldb); strlen(seldb),seldb);
server.appendseldb = dictid; server.appendseldb = dictid;
} }
@ -5689,7 +5689,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
robj *o = argv[j]; robj *o = argv[j];
o = getDecodedObject(o); o = getDecodedObject(o);
buf = sdscatprintf(buf,"$%d\r\n",sdslen(o->ptr)); buf = sdscatprintf(buf,"$%lu\r\n",sdslen(o->ptr));
buf = sdscatlen(buf,o->ptr,sdslen(o->ptr)); buf = sdscatlen(buf,o->ptr,sdslen(o->ptr));
buf = sdscatlen(buf,"\r\n",2); buf = sdscatlen(buf,"\r\n",2);
decrRefCount(o); decrRefCount(o);
@ -6112,7 +6112,8 @@ static void debugCommand(redisClient *c) {
val = dictGetEntryVal(de); val = dictGetEntryVal(de);
addReplySds(c,sdscatprintf(sdsempty(), addReplySds(c,sdscatprintf(sdsempty(),
"+Key at:%p refcount:%d, value at:%p refcount:%d encoding:%d\r\n", "+Key at:%p refcount:%d, value at:%p refcount:%d encoding:%d\r\n",
key, key->refcount, val, val->refcount, val->encoding)); (void*)key, key->refcount, (void*)val, val->refcount,
val->encoding));
} else { } else {
addReplySds(c,sdsnew( addReplySds(c,sdsnew(
"-ERR Syntax error, try DEBUG [SEGFAULT|OBJECT <key>|RELOAD]\r\n")); "-ERR Syntax error, try DEBUG [SEGFAULT|OBJECT <key>|RELOAD]\r\n"));

7
sds.h
View File

@ -52,7 +52,14 @@ sds sdscatlen(sds s, void *t, size_t len);
sds sdscat(sds s, char *t); sds sdscat(sds s, char *t);
sds sdscpylen(sds s, char *t, size_t len); sds sdscpylen(sds s, char *t, size_t len);
sds sdscpy(sds s, char *t); sds sdscpy(sds s, char *t);
#ifdef __GNUC__
sds sdscatprintf(sds s, const char *fmt, ...)
__attribute__((format(printf, 2, 3)));
#else
sds sdscatprintf(sds s, const char *fmt, ...); sds sdscatprintf(sds s, const char *fmt, ...);
#endif
sds sdstrim(sds s, const char *cset); sds sdstrim(sds s, const char *cset);
sds sdsrange(sds s, long start, long end); sds sdsrange(sds s, long start, long end);
void sdsupdatelen(sds s); void sdsupdatelen(sds s);