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
3c85a888
Commit
3c85a888
authored
Dec 05, 2016
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
b1fc06f7
6eb0c52d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/module.c
View file @
3c85a888
...
...
@@ -2286,8 +2286,10 @@ void RM_FreeCallReply_Rec(RedisModuleCallReply *reply, int freenested){
* to have the first level function to return on nested replies, but only
* if called by the module API. */
void
RM_FreeCallReply
(
RedisModuleCallReply
*
reply
)
{
RedisModuleCtx
*
ctx
=
reply
->
ctx
;
RM_FreeCallReply_Rec
(
reply
,
0
);
autoMemoryFreed
(
reply
->
ctx
,
REDISMODULE_AM_REPLY
,
reply
);
autoMemoryFreed
(
ctx
,
REDISMODULE_AM_REPLY
,
reply
);
}
/* Return the reply type. */
...
...
src/rdb.c
View file @
3c85a888
...
...
@@ -1939,7 +1939,7 @@ void bgsaveCommand(client *c) {
}
else
{
addReplyError
(
c
,
"An AOF log rewriting in progress: can't BGSAVE right now. "
"Use BGSAVE SCHEDULE in order to schedule a BGSAVE whenver "
"Use BGSAVE SCHEDULE in order to schedule a BGSAVE when
e
ver "
"possible."
);
}
}
else
if
(
rdbSaveBackground
(
server
.
rdb_filename
,
NULL
)
==
C_OK
)
{
...
...
src/redismodule.h
View file @
3c85a888
...
...
@@ -102,7 +102,7 @@ typedef struct RedisModuleTypeMethods {
RedisModuleTypeSaveFunc
rdb_save
;
RedisModuleTypeRewriteFunc
aof_rewrite
;
RedisModuleTypeMemUsageFunc
mem_usage
;
RedisModuleType
Rewrite
Func
digest
;
RedisModuleType
Digest
Func
digest
;
RedisModuleTypeFreeFunc
free
;
}
RedisModuleTypeMethods
;
...
...
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