fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-02 15:51:05 +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 2018-06-14 18:11:04 +02:00
commit d353023a83
3 changed files with 4 additions and 5 deletions

3
src/db.c

@ -480,8 +480,7 @@ void existsCommand(client *c) {
int j; int j;
for (j = 1; j < c->argc; j++) { for (j = 1; j < c->argc; j++) {
expireIfNeeded(c->db,c->argv[j]); if (lookupKeyRead(c->db,c->argv[j])) count++;
if (dbExists(c->db,c->argv[j])) count++;
} }
addReplyLongLong(c,count); addReplyLongLong(c,count);
} }

4
src/geohash.c

@ -144,8 +144,8 @@ int geohashEncode(const GeoHashRange *long_range, const GeoHashRange *lat_range,
(longitude - long_range->min) / (long_range->max - long_range->min); (longitude - long_range->min) / (long_range->max - long_range->min);
/* convert to fixed point based on the step size */ /* convert to fixed point based on the step size */
lat_offset *= (1 << step); lat_offset *= (1ULL << step);
long_offset *= (1 << step); long_offset *= (1ULL << step);
hash->bits = interleave64(lat_offset, long_offset); hash->bits = interleave64(lat_offset, long_offset);
return 1; return 1;
} }

2
src/networking.c

@ -247,7 +247,7 @@ void _addReplyStringToList(client *c, const char *s, size_t len) {
/* Append to this object when possible. If tail == NULL it was /* Append to this object when possible. If tail == NULL it was
* set via addDeferredMultiBulkLength(). */ * set via addDeferredMultiBulkLength(). */
if (tail && sdslen(tail)+len <= PROTO_REPLY_CHUNK_BYTES) { if (tail && (sdsavail(tail) >= len || sdslen(tail)+len <= PROTO_REPLY_CHUNK_BYTES)) {
tail = sdscatlen(tail,s,len); tail = sdscatlen(tail,s,len);
listNodeValue(ln) = tail; listNodeValue(ln) = tail;
c->reply_bytes += len; c->reply_bytes += len;