Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
1edbae86
Commit
1edbae86
authored
Jun 02, 2010
by
antirez
Browse files
Merge branch 'master' into smallkeys
parents
169dd6b7
a89b7013
Changes
2
Hide whitespace changes
Inline
Side-by-side
TODO
View file @
1edbae86
...
@@ -4,6 +4,7 @@ Redis TODO and Roadmap
...
@@ -4,6 +4,7 @@ Redis TODO and Roadmap
VERSION 2.2 TODO (Optimizations and latency)
VERSION 2.2 TODO (Optimizations and latency)
============================================
============================================
* Support for syslog(3).
* Lower the CPU usage.
* Lower the CPU usage.
* Lower the RAM usage everywhere possible.
* Lower the RAM usage everywhere possible.
* Specially encoded Sets (like Hashes).
* Specially encoded Sets (like Hashes).
...
...
redis.c
View file @
1edbae86
...
@@ -4132,7 +4132,6 @@ static int rdbLoad(char *filename) {
...
@@ -4132,7 +4132,6 @@ static int rdbLoad(char *filename) {
redisDb *db = server.db+0;
redisDb *db = server.db+0;
char buf[1024];
char buf[1024];
time_t expiretime, now = time(NULL);
time_t expiretime, now = time(NULL);
long long loadedkeys = 0;
fp = fopen(filename,"r");
fp = fopen(filename,"r");
if (!fp) return REDIS_ERR;
if (!fp) return REDIS_ERR;
...
@@ -4151,6 +4150,7 @@ static int rdbLoad(char *filename) {
...
@@ -4151,6 +4150,7 @@ static int rdbLoad(char *filename) {
}
}
while(1) {
while(1) {
robj *key, *val;
robj *key, *val;
int force_swapout;
expiretime = -1;
expiretime = -1;
/* Read type. */
/* Read type. */
...
@@ -4189,7 +4189,6 @@ static int rdbLoad(char *filename) {
...
@@ -4189,7 +4189,6 @@ static int rdbLoad(char *filename) {
redisLog(REDIS_WARNING,"Loading DB, duplicated key (%s) found! Unrecoverable error, exiting now.", key->ptr);
redisLog(REDIS_WARNING,"Loading DB, duplicated key (%s) found! Unrecoverable error, exiting now.", key->ptr);
exit(1);
exit(1);
}
}
loadedkeys++;
/* Set the expire time if needed */
/* Set the expire time if needed */
if (expiretime != -1) setExpire(db,key,expiretime);
if (expiretime != -1) setExpire(db,key,expiretime);
...
@@ -4216,9 +4215,14 @@ static int rdbLoad(char *filename) {
...
@@ -4216,9 +4215,14 @@ static int rdbLoad(char *filename) {
continue;
continue;
}
}
/* Flush data on disk once 32 MB of additional RAM are used... */
force_swapout = 0;
if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)
force_swapout = 1;
/* If we have still some hope of having some value fitting memory
/* If we have still some hope of having some value fitting memory
* then we try random sampling. */
* then we try random sampling. */
if (!swap_all_values && server.vm_enabled &&
(loadedkeys % 5000) == 0
) {
if (!swap_all_values && server.vm_enabled &&
force_swapout
) {
while (zmalloc_used_memory() > server.vm_max_memory) {
while (zmalloc_used_memory() > server.vm_max_memory) {
if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
}
}
...
@@ -8478,7 +8482,6 @@ int loadAppendOnlyFile(char *filename) {
...
@@ -8478,7 +8482,6 @@ int loadAppendOnlyFile(char *filename) {
struct redisClient *fakeClient;
struct redisClient *fakeClient;
FILE *fp = fopen(filename,"r");
FILE *fp = fopen(filename,"r");
struct redis_stat sb;
struct redis_stat sb;
unsigned long long loadedkeys = 0;
int appendonly = server.appendonly;
int appendonly = server.appendonly;
if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
...
@@ -8501,6 +8504,7 @@ int loadAppendOnlyFile(char *filename) {
...
@@ -8501,6 +8504,7 @@ int loadAppendOnlyFile(char *filename) {
char buf[128];
char buf[128];
sds argsds;
sds argsds;
struct redisCommand *cmd;
struct redisCommand *cmd;
int force_swapout;
if (fgets(buf,sizeof(buf),fp) == NULL) {
if (fgets(buf,sizeof(buf),fp) == NULL) {
if (feof(fp))
if (feof(fp))
...
@@ -8541,8 +8545,11 @@ int loadAppendOnlyFile(char *filename) {
...
@@ -8541,8 +8545,11 @@ int loadAppendOnlyFile(char *filename) {
for (j = 0; j < argc; j++) decrRefCount(argv[j]);
for (j = 0; j < argc; j++) decrRefCount(argv[j]);
zfree(argv);
zfree(argv);
/* Handle swapping while loading big datasets when VM is on */
/* Handle swapping while loading big datasets when VM is on */
loadedkeys++;
force_swapout = 0;
if (server.vm_enabled && (loadedkeys % 5000) == 0) {
if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)
force_swapout = 1;
if (server.vm_enabled && force_swapout) {
while (zmalloc_used_memory() > server.vm_max_memory) {
while (zmalloc_used_memory() > server.vm_max_memory) {
if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
}
}
...
...
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