zhuyijun/read-redis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new units for bytes specification

Browse Source
This commit is contained in:
antirez 2010-04-22 15:09:07 +02:00
parent 2b61932933
commit 723240057a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redis.c
View File

@ -989,17 +989,17 @@ static long long memtoll(const char *p, int *err) {
while(*u && isdigit(*u)) u++; while(*u && isdigit(*u)) u++;
if (*u == '\0' || !strcasecmp(u,"b")) { if (*u == '\0' || !strcasecmp(u,"b")) {
mul = 1; mul = 1;
} else if (!strcasecmp(u,"k") || !strcasecmp(u,"kb")) { } else if (!strcasecmp(u,"k")) {
mul = 1000; mul = 1000;
} else if (!strcasecmp(u,"ki") || !strcasecmp(u,"kib")) { } else if (!strcasecmp(u,"kb")) {
mul = 1024; mul = 1024;
} else if (!strcasecmp(u,"m") || !strcasecmp(u,"mb")) { } else if (!strcasecmp(u,"m")) {
mul = 1000*1000; mul = 1000*1000;
} else if (!strcasecmp(u,"mi") || !strcasecmp(u,"mib")) { } else if (!strcasecmp(u,"mb")) {
mul = 1024*1024; mul = 1024*1024;
} else if (!strcasecmp(u,"g") || !strcasecmp(u,"hb")) { } else if (!strcasecmp(u,"g")) {
mul = 1000L*1000*1000; mul = 1000L*1000*1000;
} else if (!strcasecmp(u,"gi") || !strcasecmp(u,"gib")) { } else if (!strcasecmp(u,"gb")) {
mul = 1024L*1024*1024; mul = 1024L*1024*1024;
} else { } else {
if (err) *err = 1; if (err) *err = 1;

12
redis.conf
View File

@ -1,5 +1,17 @@
# Redis configuration file example # Redis configuration file example
# Note on units: when memory size is needed, it is possible to specifiy
# it in the usual form of 1k 5GB 4M and so forth:
#
# 1k => 1000 bytes
# 1kb => 1024 bytes
# 1m => 1000000 bytes
# 1mb => 1024*1024 bytes
# 1g => 1000000000 bytes
# 1gb => 1024*1024*1024 bytes
#
# units are case insensitive so 1GB 1Gb 1gB are all the same.
# By default Redis does not run as a daemon. Use 'yes' if you need it. # By default Redis does not run as a daemon. Use 'yes' if you need it.
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized.
daemonize no daemonize no