Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
45ee620e
Commit
45ee620e
authored
Mar 05, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
4983eb6a
f88f8661
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/acl.c
View file @
45ee620e
...
@@ -1830,6 +1830,7 @@ void aclCommand(client *c) {
...
@@ -1830,6 +1830,7 @@ void aclCommand(client *c) {
case
ACL_DENIED_CMD
:
reasonstr
=
"command"
;
break
;
case
ACL_DENIED_CMD
:
reasonstr
=
"command"
;
break
;
case
ACL_DENIED_KEY
:
reasonstr
=
"key"
;
break
;
case
ACL_DENIED_KEY
:
reasonstr
=
"key"
;
break
;
case
ACL_DENIED_AUTH
:
reasonstr
=
"auth"
;
break
;
case
ACL_DENIED_AUTH
:
reasonstr
=
"auth"
;
break
;
default:
reasonstr
=
"unknown"
;
}
}
addReplyBulkCString
(
c
,
reasonstr
);
addReplyBulkCString
(
c
,
reasonstr
);
...
...
src/redis-cli.c
View file @
45ee620e
...
@@ -7737,7 +7737,7 @@ static void LRUTestMode(void) {
...
@@ -7737,7 +7737,7 @@ static void LRUTestMode(void) {
* to fill the target instance easily. */
* to fill the target instance easily. */
start_cycle
=
mstime
();
start_cycle
=
mstime
();
long
long
hits
=
0
,
misses
=
0
;
long
long
hits
=
0
,
misses
=
0
;
while
(
mstime
()
-
start_cycle
<
1000
)
{
while
(
mstime
()
-
start_cycle
<
LRU_CYCLE_PERIOD
)
{
/* Write cycle. */
/* Write cycle. */
for
(
j
=
0
;
j
<
LRU_CYCLE_PIPELINE_SIZE
;
j
++
)
{
for
(
j
=
0
;
j
<
LRU_CYCLE_PIPELINE_SIZE
;
j
++
)
{
char
val
[
6
];
char
val
[
6
];
...
...
src/sdsalloc.h
View file @
45ee620e
...
@@ -36,7 +36,12 @@
...
@@ -36,7 +36,12 @@
* the include of your alternate allocator if needed (not needed in order
* the include of your alternate allocator if needed (not needed in order
* to use the default libc allocator). */
* to use the default libc allocator). */
#ifndef __SDS_ALLOC_H__
#define __SDS_ALLOC_H__
#include "zmalloc.h"
#include "zmalloc.h"
#define s_malloc zmalloc
#define s_malloc zmalloc
#define s_realloc zrealloc
#define s_realloc zrealloc
#define s_free zfree
#define s_free zfree
#endif
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