Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
a4152119
Commit
a4152119
authored
Sep 19, 2017
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
b75ae0bb
2d13bf4c
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/redis-benchmark.c
View file @
a4152119
...
...
@@ -572,8 +572,8 @@ usage:
" -a <password> Password for Redis Auth
\n
"
" -c <clients> Number of parallel connections (default 50)
\n
"
" -n <requests> Total number of requests (default 100000)
\n
"
" -d <size> Data size of SET/GET value in bytes (default
2
)
\n
"
" --dbnum <db>
SELECT the specified db number (default 0)
\n
"
" -d <size> Data size of SET/GET value in bytes (default
3
)
\n
"
" --dbnum <db> SELECT the specified db number (default 0)
\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
"
" Using this option the benchmark will expand the string __rand_int__
\n
"
...
...
src/redis-cli.c
View file @
a4152119
...
...
@@ -632,7 +632,6 @@ sds sdscatcolor(sds o, char *s, size_t len, char *color) {
int
bold
=
strstr
(
color
,
"bold"
)
!=
NULL
;
int
ccode
=
37
;
/* Defaults to white. */
if
(
strstr
(
color
,
"red"
))
ccode
=
31
;
else
if
(
strstr
(
color
,
"red"
))
ccode
=
31
;
else
if
(
strstr
(
color
,
"green"
))
ccode
=
32
;
else
if
(
strstr
(
color
,
"yellow"
))
ccode
=
33
;
else
if
(
strstr
(
color
,
"blue"
))
ccode
=
34
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment