fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-26 19:12:14 +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 2020-03-05 10:54:51 +01:00
commit 45ee620e9c
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/acl.c
View File

@ -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);

2
src/redis-cli.c
View File

@ -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];

5
src/sdsalloc.h
View File

@ -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