fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-18 16:40:50 +00:00
Code Issues Projects Releases Wiki Activity

if /dev/urandom is not available use rand() to get a random node name

Browse Source
This commit is contained in:
antirez 2011-05-04 10:30:22 +02:00
parent 35845afba0
commit a5dce40726
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cluster.c
View File

@ -24,12 +24,10 @@ void clusterGetRandomName(char *p) {
char *charset = "0123456789abcdef";
int j;
if (!fp) {
redisLog(REDIS_WARNING,
"Unrecovarable error: can't open /dev/urandom:%s" ,strerror(errno));
exit(1);
if (fp == NULL || fread(p,REDIS_CLUSTER_NAMELEN,1,fp) == 0) {
for (j = 0; j < REDIS_CLUSTER_NAMELEN; j++)
p[j] = rand();
}
fread(p,REDIS_CLUSTER_NAMELEN,1,fp);
for (j = 0; j < REDIS_CLUSTER_NAMELEN; j++)
p[j] = charset[p[j] & 0x0F];
fclose(fp);

2
src/t_zset.c
View File

@ -1233,7 +1233,7 @@ int zuiNext(zsetopsrc *op, zsetopval *val) {
if (op->type == REDIS_SET) {
iterset *it = &op->iter.set;
if (op->encoding == REDIS_ENCODING_INTSET) {
if (!intsetGet(it->is.is,it->is.ii,&val->ell))
if (!intsetGet(it->is.is,it->is.ii,(int64_t*)&val->ell))
return 0;
val->score = 1.0;