fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 17:10:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'unstable' of github.com:/antirez/redis into unstable

Browse Source
This commit is contained in:
antirez 2017-09-19 10:35:49 +02:00
commit a4152119c6
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/redis-benchmark.c
View File

@ -572,7 +572,7 @@ usage:
" -a <password> Password for Redis Auth\n" " -a <password> Password for Redis Auth\n"
" -c <clients> Number of parallel connections (default 50)\n" " -c <clients> Number of parallel connections (default 50)\n"
" -n <requests> Total number of requests (default 100000)\n" " -n <requests> Total number of requests (default 100000)\n"
" -d <size> Data size of SET/GET value in bytes (default 2)\n" " -d <size> Data size of SET/GET value in bytes (default 3)\n"
" --dbnum <db> SELECT the specified db number (default 0)\n" " --dbnum <db> SELECT the specified db number (default 0)\n"
" -k <boolean> 1=keep alive 0=reconnect (default 1)\n" " -k <boolean> 1=keep alive 0=reconnect (default 1)\n"
" -r <keyspacelen> Use random keys for SET/GET/INCR, random values for SADD\n" " -r <keyspacelen> Use random keys for SET/GET/INCR, random values for SADD\n"

1
src/redis-cli.c
View File

@ -632,7 +632,6 @@ sds sdscatcolor(sds o, char *s, size_t len, char *color) {
int bold = strstr(color,"bold") != NULL; int bold = strstr(color,"bold") != NULL;
int ccode = 37; /* Defaults to white. */ int ccode = 37; /* Defaults to white. */
if (strstr(color,"red")) ccode = 31; if (strstr(color,"red")) ccode = 31;
else if (strstr(color,"red")) ccode = 31;
else if (strstr(color,"green")) ccode = 32; else if (strstr(color,"green")) ccode = 32;
else if (strstr(color,"yellow")) ccode = 33; else if (strstr(color,"yellow")) ccode = 33;
else if (strstr(color,"blue")) ccode = 34; else if (strstr(color,"blue")) ccode = 34;