fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +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 2016-12-05 14:17:11 +01:00
commit 3c85a88888
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/module.c
View File

@ -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 * to have the first level function to return on nested replies, but only
* if called by the module API. */ * if called by the module API. */
void RM_FreeCallReply(RedisModuleCallReply *reply) { void RM_FreeCallReply(RedisModuleCallReply *reply) {
RedisModuleCtx *ctx = reply->ctx;
RM_FreeCallReply_Rec(reply,0); RM_FreeCallReply_Rec(reply,0);
autoMemoryFreed(reply->ctx,REDISMODULE_AM_REPLY,reply); autoMemoryFreed(ctx,REDISMODULE_AM_REPLY,reply);
} }
/* Return the reply type. */ /* Return the reply type. */

2
src/rdb.c
View File

@ -1939,7 +1939,7 @@ void bgsaveCommand(client *c) {
} else { } else {
addReplyError(c, addReplyError(c,
"An AOF log rewriting in progress: can't BGSAVE right now. " "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 whenever "
"possible."); "possible.");
} }
} else if (rdbSaveBackground(server.rdb_filename,NULL) == C_OK) { } else if (rdbSaveBackground(server.rdb_filename,NULL) == C_OK) {

2
src/redismodule.h
View File

@ -102,7 +102,7 @@ typedef struct RedisModuleTypeMethods {
RedisModuleTypeSaveFunc rdb_save; RedisModuleTypeSaveFunc rdb_save;
RedisModuleTypeRewriteFunc aof_rewrite; RedisModuleTypeRewriteFunc aof_rewrite;
RedisModuleTypeMemUsageFunc mem_usage; RedisModuleTypeMemUsageFunc mem_usage;
RedisModuleTypeRewriteFunc digest; RedisModuleTypeDigestFunc digest;
RedisModuleTypeFreeFunc free; RedisModuleTypeFreeFunc free;
} RedisModuleTypeMethods; } RedisModuleTypeMethods;