fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-13 09:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into zrevrangebyscore

Browse Source
This commit is contained in:
Pieter Noordhuis
2010-10-13 20:29:50 +02:00
parent d433ebc681 b4f2e412d0
commit 26f3388d27
13 changed files with 673 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/redis.c
View File

@ -890,9 +890,6 @@ void call(redisClient *c, struct redisCommand *cmd) {
int processCommand(redisClient *c) {
struct redisCommand *cmd;
/* Free some memory if needed (maxmemory setting) */
if (server.maxmemory) freeMemoryIfNeeded();
/* Handle the multi bulk command type. This is an alternative protocol
* supported by Redis in order to receive commands that are composed of
* multiple binary-safe "bulk" arguments. The latency of processing is
@ -1030,7 +1027,12 @@ int processCommand(redisClient *c) {
return 1;
}
/* Handle the maxmemory directive */
/* Handle the maxmemory directive.
*
* First we try to free some memory if possible (if there are volatile
* keys in the dataset). If there are not the only thing we can do
* is returning an error. */
if (server.maxmemory) freeMemoryIfNeeded();
if (server.maxmemory && (cmd->flags & REDIS_CMD_DENYOOM) &&
zmalloc_used_memory() > server.maxmemory)
{