2014-05-12 14:38:17 -04:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
|
Multiple GEORADIUS bugs fixed.
By grepping the continuous integration errors log a number of GEORADIUS
tests failures were detected.
Fortunately when a GEORADIUS failure happens, the test suite logs enough
information in order to reproduce the problem: the PRNG seed,
coordinates and radius of the query.
By reproducing the issues, three different bugs were discovered and
fixed in this commit. This commit also improves the already good
reporting of the fuzzer and adds the failure vectors as regression
tests.
The issues found:
1. We need larger squares around the poles in order to cover the area
requested by the user. There were already checks in order to use a
smaller step (larger squares) but the limit set (+/- 67 degrees) is not
enough in certain edge cases, so 66 is used now.
2. Even near the equator, when the search area center is very near the
edge of the square, the north, south, west or ovest square may not be
able to fully cover the specified radius. Now a test is performed at the
edge of the initial guessed search area, and larger squares are used in
case the test fails.
3. Because of rounding errors between Redis and Tcl, sometimes the test
signaled false positives. This is now addressed.
Whenever possible the original code was improved a bit in other ways. A
debugging example stanza was added in order to make the next debugging
session simpler when the next bug is found.
2016-07-27 05:07:23 -04:00
|
|
|
* Copyright (c) 2015-2016, Salvatore Sanfilippo <antirez@gmail.com>.
|
2014-05-12 14:38:17 -04:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions are met:
|
|
|
|
*
|
|
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
|
|
* this list of conditions and the following disclaimer.
|
|
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
|
|
* to endorse or promote products derived from this software without
|
|
|
|
* specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "geo.h"
|
|
|
|
#include "geohash_helper.h"
|
Multiple GEORADIUS bugs fixed.
By grepping the continuous integration errors log a number of GEORADIUS
tests failures were detected.
Fortunately when a GEORADIUS failure happens, the test suite logs enough
information in order to reproduce the problem: the PRNG seed,
coordinates and radius of the query.
By reproducing the issues, three different bugs were discovered and
fixed in this commit. This commit also improves the already good
reporting of the fuzzer and adds the failure vectors as regression
tests.
The issues found:
1. We need larger squares around the poles in order to cover the area
requested by the user. There were already checks in order to use a
smaller step (larger squares) but the limit set (+/- 67 degrees) is not
enough in certain edge cases, so 66 is used now.
2. Even near the equator, when the search area center is very near the
edge of the square, the north, south, west or ovest square may not be
able to fully cover the specified radius. Now a test is performed at the
edge of the initial guessed search area, and larger squares are used in
case the test fails.
3. Because of rounding errors between Redis and Tcl, sometimes the test
signaled false positives. This is now addressed.
Whenever possible the original code was improved a bit in other ways. A
debugging example stanza was added in order to make the next debugging
session simpler when the next bug is found.
2016-07-27 05:07:23 -04:00
|
|
|
#include "debugmacro.h"
|
2015-06-22 12:08:06 -04:00
|
|
|
|
|
|
|
/* Things exported from t_zset.c only for geo.c, since it is the only other
|
|
|
|
* part of Redis that requires close zset introspection. */
|
|
|
|
unsigned char *zzlFirstInRange(unsigned char *zl, zrangespec *range);
|
|
|
|
int zslValueLteMax(double value, zrangespec *spec);
|
2014-05-12 14:38:17 -04:00
|
|
|
|
|
|
|
/* ====================================================================
|
2015-06-22 12:08:06 -04:00
|
|
|
* This file implements the following commands:
|
|
|
|
*
|
2014-05-12 14:38:17 -04:00
|
|
|
* - geoadd - add coordinates for value to geoset
|
|
|
|
* - georadius - search radius by coordinates in geoset
|
|
|
|
* - georadiusbymember - search radius based on geoset member position
|
|
|
|
* ==================================================================== */
|
|
|
|
|
2015-06-22 12:08:06 -04:00
|
|
|
/* ====================================================================
|
|
|
|
* geoArray implementation
|
|
|
|
* ==================================================================== */
|
|
|
|
|
|
|
|
/* Create a new array of geoPoints. */
|
|
|
|
geoArray *geoArrayCreate(void) {
|
|
|
|
geoArray *ga = zmalloc(sizeof(*ga));
|
|
|
|
/* It gets allocated on first geoArrayAppend() call. */
|
|
|
|
ga->array = NULL;
|
|
|
|
ga->buckets = 0;
|
|
|
|
ga->used = 0;
|
|
|
|
return ga;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add a new entry and return its pointer so that the caller can populate
|
|
|
|
* it with data. */
|
|
|
|
geoPoint *geoArrayAppend(geoArray *ga) {
|
|
|
|
if (ga->used == ga->buckets) {
|
|
|
|
ga->buckets = (ga->buckets == 0) ? 8 : ga->buckets*2;
|
|
|
|
ga->array = zrealloc(ga->array,sizeof(geoPoint)*ga->buckets);
|
|
|
|
}
|
|
|
|
geoPoint *gp = ga->array+ga->used;
|
|
|
|
ga->used++;
|
|
|
|
return gp;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Destroy a geoArray created with geoArrayCreate(). */
|
|
|
|
void geoArrayFree(geoArray *ga) {
|
|
|
|
size_t i;
|
|
|
|
for (i = 0; i < ga->used; i++) sdsfree(ga->array[i].member);
|
|
|
|
zfree(ga->array);
|
|
|
|
zfree(ga);
|
|
|
|
}
|
|
|
|
|
2014-05-12 14:38:17 -04:00
|
|
|
/* ====================================================================
|
|
|
|
* Helpers
|
|
|
|
* ==================================================================== */
|
2015-06-29 09:57:17 -04:00
|
|
|
int decodeGeohash(double bits, double *xy) {
|
2014-05-12 14:38:17 -04:00
|
|
|
GeoHashBits hash = { .bits = (uint64_t)bits, .step = GEO_STEP_MAX };
|
2015-06-25 12:05:45 -04:00
|
|
|
return geohashDecodeToLongLatWGS84(hash, xy);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Input Argument Helper */
|
2015-06-23 04:27:45 -04:00
|
|
|
/* Take a pointer to the latitude arg then use the next arg for longitude.
|
2015-07-26 17:17:55 -04:00
|
|
|
* On parse error C_ERR is returned, otherwise C_OK. */
|
2015-10-07 16:27:18 -04:00
|
|
|
int extractLongLatOrReply(client *c, robj **argv, double *xy) {
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < 2; i++) {
|
2015-06-25 12:05:45 -04:00
|
|
|
if (getDoubleFromObjectOrReply(c, argv[i], xy + i, NULL) !=
|
2015-07-26 17:17:55 -04:00
|
|
|
C_OK) {
|
|
|
|
return C_ERR;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
2015-10-07 16:27:18 -04:00
|
|
|
}
|
|
|
|
if (xy[0] < GEO_LONG_MIN || xy[0] > GEO_LONG_MAX ||
|
|
|
|
xy[1] < GEO_LAT_MIN || xy[1] > GEO_LAT_MAX) {
|
|
|
|
addReplySds(c, sdscatprintf(sdsempty(),
|
|
|
|
"-ERR invalid longitude,latitude pair %f,%f\r\n",xy[0],xy[1]));
|
|
|
|
return C_ERR;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
2015-07-26 17:17:55 -04:00
|
|
|
return C_OK;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Input Argument Helper */
|
2015-06-22 12:08:06 -04:00
|
|
|
/* Decode lat/long from a zset member's score.
|
2015-07-26 17:17:55 -04:00
|
|
|
* Returns C_OK on successful decoding, otherwise C_ERR is returned. */
|
2015-06-29 09:57:17 -04:00
|
|
|
int longLatFromMember(robj *zobj, robj *member, double *xy) {
|
2014-05-12 14:38:17 -04:00
|
|
|
double score = 0;
|
|
|
|
|
2015-08-04 03:20:55 -04:00
|
|
|
if (zsetScore(zobj, member->ptr, &score) == C_ERR) return C_ERR;
|
2015-07-26 17:17:55 -04:00
|
|
|
if (!decodeGeohash(score, xy)) return C_ERR;
|
|
|
|
return C_OK;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2015-06-29 06:44:31 -04:00
|
|
|
/* Check that the unit argument matches one of the known units, and returns
|
|
|
|
* the conversion factor to meters (you need to divide meters by the conversion
|
|
|
|
* factor to convert to the right unit).
|
|
|
|
*
|
|
|
|
* If the unit is not valid, an error is reported to the client, and a value
|
|
|
|
* less than zero is returned. */
|
2015-07-26 09:20:46 -04:00
|
|
|
double extractUnitOrReply(client *c, robj *unit) {
|
2015-06-29 06:44:31 -04:00
|
|
|
char *u = unit->ptr;
|
|
|
|
|
2015-06-29 10:02:33 -04:00
|
|
|
if (!strcmp(u, "m")) {
|
2015-06-29 06:44:31 -04:00
|
|
|
return 1;
|
2015-06-29 10:02:33 -04:00
|
|
|
} else if (!strcmp(u, "km")) {
|
|
|
|
return 1000;
|
|
|
|
} else if (!strcmp(u, "ft")) {
|
2015-06-29 06:44:31 -04:00
|
|
|
return 0.3048;
|
2015-06-29 10:02:33 -04:00
|
|
|
} else if (!strcmp(u, "mi")) {
|
2015-06-29 06:44:31 -04:00
|
|
|
return 1609.34;
|
|
|
|
} else {
|
2015-06-29 10:02:33 -04:00
|
|
|
addReplyError(c,
|
|
|
|
"unsupported unit provided. please use m, km, ft, mi");
|
2015-06-29 06:44:31 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-23 04:27:45 -04:00
|
|
|
/* Input Argument Helper.
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* Extract the distance from the specified two arguments starting at 'argv'
|
2020-12-11 19:21:05 -05:00
|
|
|
* that should be in the form: <number> <unit>, and return C_OK or C_ERR means success or failure
|
|
|
|
* *conversions is populated with the coefficient to use in order to convert meters to the unit.*/
|
|
|
|
int extractDistanceOrReply(client *c, robj **argv,
|
|
|
|
double *conversion, double *radius) {
|
2014-05-12 14:38:17 -04:00
|
|
|
double distance;
|
|
|
|
if (getDoubleFromObjectOrReply(c, argv[0], &distance,
|
2015-07-26 17:17:55 -04:00
|
|
|
"need numeric radius") != C_OK) {
|
2020-12-11 19:21:05 -05:00
|
|
|
return C_ERR;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2016-05-23 06:58:50 -04:00
|
|
|
if (distance < 0) {
|
|
|
|
addReplyError(c,"radius cannot be negative");
|
2020-12-11 19:21:05 -05:00
|
|
|
return C_ERR;
|
2016-05-23 06:58:50 -04:00
|
|
|
}
|
2020-12-11 19:21:05 -05:00
|
|
|
if (radius) *radius = distance;
|
2016-12-20 04:12:38 -05:00
|
|
|
|
2015-06-29 06:44:31 -04:00
|
|
|
double to_meters = extractUnitOrReply(c,argv[1]);
|
2016-05-04 02:59:56 -04:00
|
|
|
if (to_meters < 0) {
|
2020-12-11 19:21:05 -05:00
|
|
|
return C_ERR;
|
2016-05-04 02:59:56 -04:00
|
|
|
}
|
2014-05-12 14:38:17 -04:00
|
|
|
|
2015-06-29 06:44:31 -04:00
|
|
|
if (conversion) *conversion = to_meters;
|
2020-12-11 19:21:05 -05:00
|
|
|
return C_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Input Argument Helper.
|
|
|
|
* Extract height and width from the specified three arguments starting at 'argv'
|
|
|
|
* that should be in the form: <number> <number> <unit>, and return C_OK or C_ERR means success or failure
|
|
|
|
* *conversions is populated with the coefficient to use in order to convert meters to the unit.*/
|
|
|
|
int extractBoxOrReply(client *c, robj **argv, double *conversion,
|
|
|
|
double *height, double *width) {
|
|
|
|
double h, w;
|
|
|
|
if ((getDoubleFromObjectOrReply(c, argv[0], &h, "need numeric height") != C_OK) ||
|
|
|
|
(getDoubleFromObjectOrReply(c, argv[1], &w, "need numeric width") != C_OK)) {
|
|
|
|
return C_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (h < 0 || w < 0) {
|
|
|
|
addReplyError(c, "height or width cannot be negative");
|
|
|
|
return C_ERR;
|
|
|
|
}
|
|
|
|
if (height) *height = h;
|
|
|
|
if (width) *width = w;
|
|
|
|
|
|
|
|
double to_meters = extractUnitOrReply(c,argv[2]);
|
|
|
|
if (to_meters < 0) {
|
|
|
|
return C_ERR;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (conversion) *conversion = to_meters;
|
|
|
|
return C_OK;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2016-02-18 18:01:34 -05:00
|
|
|
/* The default addReplyDouble has too much accuracy. We use this
|
2015-06-22 07:08:46 -04:00
|
|
|
* for returning location distances. "5.2145 meters away" is nicer
|
|
|
|
* than "5.2144992818115 meters away." We provide 4 digits after the dot
|
|
|
|
* so that the returned value is decently accurate even when the unit is
|
|
|
|
* the kilometer. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void addReplyDoubleDistance(client *c, double d) {
|
2015-06-22 07:08:46 -04:00
|
|
|
char dbuf[128];
|
|
|
|
int dlen = snprintf(dbuf, sizeof(dbuf), "%.4f", d);
|
2014-05-12 14:38:17 -04:00
|
|
|
addReplyBulkCBuffer(c, dbuf, dlen);
|
|
|
|
}
|
|
|
|
|
2015-06-22 12:08:06 -04:00
|
|
|
/* Helper function for geoGetPointsInRange(): given a sorted set score
|
2020-12-11 19:21:05 -05:00
|
|
|
* representing a point, and a GeoShape, appends this entry as a geoPoint
|
|
|
|
* into the specified geoArray only if the point is within the search area.
|
2015-06-22 12:08:06 -04:00
|
|
|
*
|
2015-07-26 17:17:55 -04:00
|
|
|
* returns C_OK if the point is included, or REIDS_ERR if it is outside. */
|
2020-12-11 19:21:05 -05:00
|
|
|
int geoAppendIfWithinShape(geoArray *ga, GeoShape *shape, double score, sds member) {
|
|
|
|
double distance = 0, xy[2];
|
2015-06-22 12:08:06 -04:00
|
|
|
|
2015-07-26 17:17:55 -04:00
|
|
|
if (!decodeGeohash(score,xy)) return C_ERR; /* Can't decode. */
|
2015-06-23 03:30:14 -04:00
|
|
|
/* Note that geohashGetDistanceIfInRadiusWGS84() takes arguments in
|
|
|
|
* reverse order: longitude first, latitude later. */
|
2020-12-11 19:21:05 -05:00
|
|
|
if (shape->type == CIRCULAR_TYPE) {
|
|
|
|
if (!geohashGetDistanceIfInRadiusWGS84(shape->xy[0], shape->xy[1], xy[0], xy[1],
|
|
|
|
shape->t.radius*shape->conversion, &distance)) return C_ERR;
|
|
|
|
} else if (shape->type == RECTANGLE_TYPE) {
|
|
|
|
if (!geohashGetDistanceIfInRectangle(shape->bounds, shape->xy[0], shape->xy[1],
|
|
|
|
xy[0], xy[1], &distance)) return C_ERR;
|
2015-06-22 12:08:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Append the new element. */
|
|
|
|
geoPoint *gp = geoArrayAppend(ga);
|
2015-06-25 12:05:45 -04:00
|
|
|
gp->longitude = xy[0];
|
|
|
|
gp->latitude = xy[1];
|
2015-06-22 12:08:06 -04:00
|
|
|
gp->dist = distance;
|
|
|
|
gp->member = member;
|
|
|
|
gp->score = score;
|
2015-07-26 17:17:55 -04:00
|
|
|
return C_OK;
|
2015-06-22 12:08:06 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Query a Redis sorted set to extract all the elements between 'min' and
|
|
|
|
* 'max', appending them into the array of geoPoint structures 'gparray'.
|
|
|
|
* The command returns the number of elements added to the array.
|
|
|
|
*
|
|
|
|
* Elements which are farest than 'radius' from the specified 'x' and 'y'
|
|
|
|
* coordinates are not included.
|
|
|
|
*
|
|
|
|
* The ability of this function to append to an existing set of points is
|
|
|
|
* important for good performances because querying by radius is performed
|
|
|
|
* using multiple queries to the sorted set, that we later need to sort
|
|
|
|
* via qsort. Similarly we need to be able to reject points outside the search
|
|
|
|
* radius area ASAP in order to allocate and process more points than needed. */
|
2020-12-11 19:21:05 -05:00
|
|
|
int geoGetPointsInRange(robj *zobj, double min, double max, GeoShape *shape, geoArray *ga) {
|
2015-06-22 12:08:06 -04:00
|
|
|
/* minex 0 = include min in range; maxex 1 = exclude max in range */
|
|
|
|
/* That's: min <= val < max */
|
|
|
|
zrangespec range = { .min = min, .max = max, .minex = 0, .maxex = 1 };
|
|
|
|
size_t origincount = ga->used;
|
|
|
|
sds member;
|
|
|
|
|
2015-07-26 09:28:00 -04:00
|
|
|
if (zobj->encoding == OBJ_ENCODING_ZIPLIST) {
|
2015-06-22 12:08:06 -04:00
|
|
|
unsigned char *zl = zobj->ptr;
|
|
|
|
unsigned char *eptr, *sptr;
|
|
|
|
unsigned char *vstr = NULL;
|
|
|
|
unsigned int vlen = 0;
|
|
|
|
long long vlong = 0;
|
|
|
|
double score = 0;
|
|
|
|
|
|
|
|
if ((eptr = zzlFirstInRange(zl, &range)) == NULL) {
|
|
|
|
/* Nothing exists starting at our min. No results. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
sptr = ziplistNext(zl, eptr);
|
|
|
|
while (eptr) {
|
|
|
|
score = zzlGetScore(sptr);
|
|
|
|
|
|
|
|
/* If we fell out of range, break. */
|
|
|
|
if (!zslValueLteMax(score, &range))
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* We know the element exists. ziplistGet should always succeed */
|
|
|
|
ziplistGet(eptr, &vstr, &vlen, &vlong);
|
|
|
|
member = (vstr == NULL) ? sdsfromlonglong(vlong) :
|
|
|
|
sdsnewlen(vstr,vlen);
|
2020-12-11 19:21:05 -05:00
|
|
|
if (geoAppendIfWithinShape(ga,shape,score,member)
|
2015-07-26 17:17:55 -04:00
|
|
|
== C_ERR) sdsfree(member);
|
2015-06-22 12:08:06 -04:00
|
|
|
zzlNext(zl, &eptr, &sptr);
|
|
|
|
}
|
2015-07-26 09:28:00 -04:00
|
|
|
} else if (zobj->encoding == OBJ_ENCODING_SKIPLIST) {
|
2015-06-22 12:08:06 -04:00
|
|
|
zset *zs = zobj->ptr;
|
|
|
|
zskiplist *zsl = zs->zsl;
|
|
|
|
zskiplistNode *ln;
|
|
|
|
|
|
|
|
if ((ln = zslFirstInRange(zsl, &range)) == NULL) {
|
|
|
|
/* Nothing exists starting at our min. No results. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (ln) {
|
2015-08-04 03:20:55 -04:00
|
|
|
sds ele = ln->ele;
|
2015-06-22 12:08:06 -04:00
|
|
|
/* Abort when the node is no longer in range. */
|
|
|
|
if (!zslValueLteMax(ln->score, &range))
|
|
|
|
break;
|
|
|
|
|
2015-08-04 03:20:55 -04:00
|
|
|
ele = sdsdup(ele);
|
2020-12-11 19:21:05 -05:00
|
|
|
if (geoAppendIfWithinShape(ga,shape,ln->score,ele)
|
2015-08-04 03:20:55 -04:00
|
|
|
== C_ERR) sdsfree(ele);
|
2015-06-22 12:08:06 -04:00
|
|
|
ln = ln->level[0].forward;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ga->used - origincount;
|
|
|
|
}
|
|
|
|
|
2015-06-29 03:34:05 -04:00
|
|
|
/* Compute the sorted set scores min (inclusive), max (exclusive) we should
|
|
|
|
* query in order to retrieve all the elements inside the specified area
|
|
|
|
* 'hash'. The two scores are returned by reference in *min and *max. */
|
|
|
|
void scoresOfGeoHashBox(GeoHashBits hash, GeoHashFix52Bits *min, GeoHashFix52Bits *max) {
|
2015-06-24 11:37:20 -04:00
|
|
|
/* We want to compute the sorted set scores that will include all the
|
|
|
|
* elements inside the specified Geohash 'hash', which has as many
|
|
|
|
* bits as specified by hash.step * 2.
|
|
|
|
*
|
|
|
|
* So if step is, for example, 3, and the hash value in binary
|
|
|
|
* is 101010, since our score is 52 bits we want every element which
|
|
|
|
* is in binary: 101010?????????????????????????????????????????????
|
|
|
|
* Where ? can be 0 or 1.
|
|
|
|
*
|
|
|
|
* To get the min score we just use the initial hash value left
|
|
|
|
* shifted enough to get the 52 bit value. Later we increment the
|
|
|
|
* 6 bit prefis (see the hash.bits++ statement), and get the new
|
|
|
|
* prefix: 101011, which we align again to 52 bits to get the maximum
|
|
|
|
* value (which is excluded from the search). So we get everything
|
|
|
|
* between the two following scores (represented in binary):
|
|
|
|
*
|
|
|
|
* 1010100000000000000000000000000000000000000000000000 (included)
|
|
|
|
* and
|
|
|
|
* 1010110000000000000000000000000000000000000000000000 (excluded).
|
|
|
|
*/
|
2015-06-29 03:34:05 -04:00
|
|
|
*min = geohashAlign52Bits(hash);
|
2014-05-12 14:38:17 -04:00
|
|
|
hash.bits++;
|
2015-06-29 03:34:05 -04:00
|
|
|
*max = geohashAlign52Bits(hash);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Obtain all members between the min/max of this geohash bounding box.
|
|
|
|
* Populate a geoArray of GeoPoints by calling geoGetPointsInRange().
|
|
|
|
* Return the number of points added to the array. */
|
2020-12-11 19:21:05 -05:00
|
|
|
int membersOfGeoHashBox(robj *zobj, GeoHashBits hash, geoArray *ga, GeoShape *shape) {
|
2015-06-29 03:34:05 -04:00
|
|
|
GeoHashFix52Bits min, max;
|
2014-05-12 14:38:17 -04:00
|
|
|
|
2015-06-29 03:34:05 -04:00
|
|
|
scoresOfGeoHashBox(hash,&min,&max);
|
2020-12-11 19:21:05 -05:00
|
|
|
return geoGetPointsInRange(zobj, min, max, shape, ga);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Search all eight neighbors + self geohash box */
|
2020-12-11 19:21:05 -05:00
|
|
|
int membersOfAllNeighbors(robj *zobj, GeoHashRadius n, GeoShape *shape, geoArray *ga) {
|
2014-05-12 14:38:17 -04:00
|
|
|
GeoHashBits neighbors[9];
|
2015-09-14 17:05:40 -04:00
|
|
|
unsigned int i, count = 0, last_processed = 0;
|
2016-12-05 08:02:32 -05:00
|
|
|
int debugmsg = 0;
|
2014-05-12 14:38:17 -04:00
|
|
|
|
|
|
|
neighbors[0] = n.hash;
|
|
|
|
neighbors[1] = n.neighbors.north;
|
|
|
|
neighbors[2] = n.neighbors.south;
|
|
|
|
neighbors[3] = n.neighbors.east;
|
|
|
|
neighbors[4] = n.neighbors.west;
|
|
|
|
neighbors[5] = n.neighbors.north_east;
|
|
|
|
neighbors[6] = n.neighbors.north_west;
|
|
|
|
neighbors[7] = n.neighbors.south_east;
|
|
|
|
neighbors[8] = n.neighbors.south_west;
|
|
|
|
|
|
|
|
/* For each neighbor (*and* our own hashbox), get all the matching
|
|
|
|
* members and add them to the potential result list. */
|
2015-06-22 05:24:58 -04:00
|
|
|
for (i = 0; i < sizeof(neighbors) / sizeof(*neighbors); i++) {
|
2016-12-05 08:02:32 -05:00
|
|
|
if (HASHISZERO(neighbors[i])) {
|
|
|
|
if (debugmsg) D("neighbors[%d] is zero",i);
|
2014-05-12 14:38:17 -04:00
|
|
|
continue;
|
2016-12-05 08:02:32 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Debugging info. */
|
|
|
|
if (debugmsg) {
|
|
|
|
GeoHashRange long_range, lat_range;
|
|
|
|
geohashGetCoordRange(&long_range,&lat_range);
|
|
|
|
GeoHashArea myarea = {{0}};
|
|
|
|
geohashDecode(long_range, lat_range, neighbors[i], &myarea);
|
|
|
|
|
|
|
|
/* Dump center square. */
|
|
|
|
D("neighbors[%d]:\n",i);
|
|
|
|
D("area.longitude.min: %f\n", myarea.longitude.min);
|
|
|
|
D("area.longitude.max: %f\n", myarea.longitude.max);
|
|
|
|
D("area.latitude.min: %f\n", myarea.latitude.min);
|
|
|
|
D("area.latitude.max: %f\n", myarea.latitude.max);
|
|
|
|
D("\n");
|
|
|
|
}
|
2015-09-14 17:05:40 -04:00
|
|
|
|
|
|
|
/* When a huge Radius (in the 5000 km range or more) is used,
|
|
|
|
* adjacent neighbors can be the same, leading to duplicated
|
|
|
|
* elements. Skip every range which is the same as the one
|
|
|
|
* processed previously. */
|
|
|
|
if (last_processed &&
|
|
|
|
neighbors[i].bits == neighbors[last_processed].bits &&
|
|
|
|
neighbors[i].step == neighbors[last_processed].step)
|
2016-12-05 08:02:32 -05:00
|
|
|
{
|
|
|
|
if (debugmsg)
|
|
|
|
D("Skipping processing of %d, same as previous\n",i);
|
2015-09-14 17:05:40 -04:00
|
|
|
continue;
|
2016-12-05 08:02:32 -05:00
|
|
|
}
|
2020-12-11 19:21:05 -05:00
|
|
|
count += membersOfGeoHashBox(zobj, neighbors[i], ga, shape);
|
2015-09-14 17:05:40 -04:00
|
|
|
last_processed = i;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
2015-06-22 12:08:06 -04:00
|
|
|
return count;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Sort comparators for qsort() */
|
|
|
|
static int sort_gp_asc(const void *a, const void *b) {
|
2015-06-22 05:53:14 -04:00
|
|
|
const struct geoPoint *gpa = a, *gpb = b;
|
2014-05-12 14:38:17 -04:00
|
|
|
/* We can't do adist - bdist because they are doubles and
|
|
|
|
* the comparator returns an int. */
|
|
|
|
if (gpa->dist > gpb->dist)
|
|
|
|
return 1;
|
|
|
|
else if (gpa->dist == gpb->dist)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sort_gp_desc(const void *a, const void *b) {
|
|
|
|
return -sort_gp_asc(a, b);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ====================================================================
|
|
|
|
* Commands
|
|
|
|
* ==================================================================== */
|
|
|
|
|
2015-06-29 03:16:27 -04:00
|
|
|
/* GEOADD key long lat name [long2 lat2 name2 ... longN latN nameN] */
|
2015-07-26 09:20:46 -04:00
|
|
|
void geoaddCommand(client *c) {
|
2015-06-29 03:20:07 -04:00
|
|
|
/* Check arguments number for sanity. */
|
|
|
|
if ((c->argc - 2) % 3 != 0) {
|
2014-05-12 14:38:17 -04:00
|
|
|
/* Need an odd number of arguments if we got this far... */
|
2015-06-29 03:20:07 -04:00
|
|
|
addReplyError(c, "syntax error. Try GEOADD key [x1] [y1] [name1] "
|
|
|
|
"[x2] [y2] [name2] ... ");
|
2014-05-12 14:38:17 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
int elements = (c->argc - 2) / 3;
|
2015-06-23 04:18:23 -04:00
|
|
|
int argc = 2+elements*2; /* ZADD key score ele ... */
|
|
|
|
robj **argv = zcalloc(argc*sizeof(robj*));
|
|
|
|
argv[0] = createRawStringObject("zadd",4);
|
|
|
|
argv[1] = c->argv[1]; /* key */
|
|
|
|
incrRefCount(argv[1]);
|
|
|
|
|
|
|
|
/* Create the argument vector to call ZADD in order to add all
|
|
|
|
* the score,value pairs to the requested zset, where score is actually
|
|
|
|
* an encoded version of lat,long. */
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < elements; i++) {
|
2015-06-25 12:05:45 -04:00
|
|
|
double xy[2];
|
2015-06-23 04:18:23 -04:00
|
|
|
|
2015-07-26 17:17:55 -04:00
|
|
|
if (extractLongLatOrReply(c, (c->argv+2)+(i*3),xy) == C_ERR) {
|
2015-06-23 04:18:23 -04:00
|
|
|
for (i = 0; i < argc; i++)
|
|
|
|
if (argv[i]) decrRefCount(argv[i]);
|
|
|
|
zfree(argv);
|
2014-05-12 14:38:17 -04:00
|
|
|
return;
|
2015-06-23 04:18:23 -04:00
|
|
|
}
|
2014-05-12 14:38:17 -04:00
|
|
|
|
2015-06-23 04:18:23 -04:00
|
|
|
/* Turn the coordinates into the score of the element. */
|
2014-05-12 14:38:17 -04:00
|
|
|
GeoHashBits hash;
|
2015-06-29 03:20:07 -04:00
|
|
|
geohashEncodeWGS84(xy[0], xy[1], GEO_STEP_MAX, &hash);
|
2014-05-12 14:38:17 -04:00
|
|
|
GeoHashFix52Bits bits = geohashAlign52Bits(hash);
|
2015-07-26 09:28:00 -04:00
|
|
|
robj *score = createObject(OBJ_STRING, sdsfromlonglong(bits));
|
2014-05-12 14:38:17 -04:00
|
|
|
robj *val = c->argv[2 + i * 3 + 2];
|
2015-06-23 04:18:23 -04:00
|
|
|
argv[2+i*2] = score;
|
|
|
|
argv[3+i*2] = val;
|
|
|
|
incrRefCount(val);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2015-06-23 04:18:23 -04:00
|
|
|
/* Finally call ZADD that will do the work for us. */
|
|
|
|
replaceClientCommandVector(c,argc,argv);
|
|
|
|
zaddCommand(c);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#define SORT_NONE 0
|
|
|
|
#define SORT_ASC 1
|
|
|
|
#define SORT_DESC 2
|
|
|
|
|
2017-06-30 04:03:37 -04:00
|
|
|
#define RADIUS_COORDS (1<<0) /* Search around coordinates. */
|
|
|
|
#define RADIUS_MEMBER (1<<1) /* Search around member. */
|
2020-12-11 19:21:05 -05:00
|
|
|
#define RADIUS_NOSTORE (1<<2) /* Do not accept STORE/STOREDIST option. */
|
|
|
|
#define GEOSEARCH (1<<3) /* GEOSEARCH command variant (different arguments supported) */
|
|
|
|
#define GEOSEARCHSTORE (1<<4) /* GEOSEARCHSTORE just accept STOREDIST option */
|
2014-05-12 14:38:17 -04:00
|
|
|
|
2015-06-27 03:38:39 -04:00
|
|
|
/* GEORADIUS key x y radius unit [WITHDIST] [WITHHASH] [WITHCOORD] [ASC|DESC]
|
2016-02-18 04:24:11 -05:00
|
|
|
* [COUNT count] [STORE key] [STOREDIST key]
|
2020-12-11 19:21:05 -05:00
|
|
|
* GEORADIUSBYMEMBER key member radius unit ... options ...
|
2020-12-17 04:02:17 -05:00
|
|
|
* GEOSEARCH key [FROMMEMBER member] [FROMLONLAT long lat] [BYRADIUS radius unit]
|
2020-12-11 19:21:05 -05:00
|
|
|
* [BYBOX width height unit] [WITHCORD] [WITHDIST] [WITHASH] [COUNT count] [ASC|DESC]
|
2020-12-17 04:02:17 -05:00
|
|
|
* GEOSEARCHSTORE dest_key src_key [FROMMEMBER member] [FROMLONLAT long lat] [BYRADIUS radius unit]
|
2020-12-11 19:21:05 -05:00
|
|
|
* [BYBOX width height unit] [WITHCORD] [WITHDIST] [WITHASH] [COUNT count] [ASC|DESC] [STOREDIST]
|
|
|
|
* */
|
|
|
|
void georadiusGeneric(client *c, int srcKeyIndex, int flags) {
|
2016-02-18 04:24:11 -05:00
|
|
|
robj *storekey = NULL;
|
|
|
|
int storedist = 0; /* 0 for STORE, 1 for STOREDIST. */
|
2014-05-12 14:38:17 -04:00
|
|
|
|
|
|
|
/* Look up the requested zset */
|
|
|
|
robj *zobj = NULL;
|
2020-12-11 19:21:05 -05:00
|
|
|
if ((zobj = lookupKeyReadOrReply(c, c->argv[srcKeyIndex], shared.emptyarray)) == NULL ||
|
2015-07-26 09:28:00 -04:00
|
|
|
checkType(c, zobj, OBJ_ZSET)) {
|
2014-05-12 14:38:17 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-12-11 19:21:05 -05:00
|
|
|
/* Find long/lat to use for radius or box search based on inquiry type */
|
2014-05-12 14:38:17 -04:00
|
|
|
int base_args;
|
2020-12-11 19:21:05 -05:00
|
|
|
GeoShape shape = {0};
|
2017-06-30 04:03:37 -04:00
|
|
|
if (flags & RADIUS_COORDS) {
|
2014-05-12 14:38:17 -04:00
|
|
|
base_args = 6;
|
2020-12-11 19:21:05 -05:00
|
|
|
shape.type = CIRCULAR_TYPE;
|
|
|
|
if (extractLongLatOrReply(c, c->argv + 2, shape.xy) == C_ERR) return;
|
|
|
|
if (extractDistanceOrReply(c, c->argv+base_args-2, &shape.conversion, &shape.t.radius) != C_OK) return;
|
2017-06-30 04:03:37 -04:00
|
|
|
} else if (flags & RADIUS_MEMBER) {
|
2014-05-12 14:38:17 -04:00
|
|
|
base_args = 5;
|
2020-12-11 19:21:05 -05:00
|
|
|
shape.type = CIRCULAR_TYPE;
|
2014-05-12 14:38:17 -04:00
|
|
|
robj *member = c->argv[2];
|
2020-12-11 19:21:05 -05:00
|
|
|
if (longLatFromMember(zobj, member, shape.xy) == C_ERR) {
|
2014-05-12 14:38:17 -04:00
|
|
|
addReplyError(c, "could not decode requested zset member");
|
|
|
|
return;
|
|
|
|
}
|
2020-12-11 19:21:05 -05:00
|
|
|
if (extractDistanceOrReply(c, c->argv+base_args-2, &shape.conversion, &shape.t.radius) != C_OK) return;
|
|
|
|
} else if (flags & GEOSEARCH) {
|
|
|
|
base_args = 2;
|
|
|
|
if (flags & GEOSEARCHSTORE) {
|
|
|
|
base_args = 3;
|
|
|
|
storekey = c->argv[1];
|
|
|
|
}
|
2014-05-12 14:38:17 -04:00
|
|
|
} else {
|
2017-06-30 04:03:37 -04:00
|
|
|
addReplyError(c, "Unknown georadius search type");
|
2014-05-12 14:38:17 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Discover and populate all optional parameters. */
|
2015-06-27 03:38:39 -04:00
|
|
|
int withdist = 0, withhash = 0, withcoords = 0;
|
2020-12-11 19:21:05 -05:00
|
|
|
int frommember = 0, fromloc = 0, byradius = 0, bybox = 0;
|
2014-05-12 14:38:17 -04:00
|
|
|
int sort = SORT_NONE;
|
2015-06-27 04:23:58 -04:00
|
|
|
long long count = 0;
|
2014-05-12 14:38:17 -04:00
|
|
|
if (c->argc > base_args) {
|
|
|
|
int remaining = c->argc - base_args;
|
|
|
|
for (int i = 0; i < remaining; i++) {
|
|
|
|
char *arg = c->argv[base_args + i]->ptr;
|
2015-06-27 03:43:47 -04:00
|
|
|
if (!strcasecmp(arg, "withdist")) {
|
2015-06-22 05:24:58 -04:00
|
|
|
withdist = 1;
|
2015-06-27 03:43:47 -04:00
|
|
|
} else if (!strcasecmp(arg, "withhash")) {
|
2015-06-22 05:24:58 -04:00
|
|
|
withhash = 1;
|
2015-06-27 03:43:47 -04:00
|
|
|
} else if (!strcasecmp(arg, "withcoord")) {
|
2015-06-22 05:24:58 -04:00
|
|
|
withcoords = 1;
|
2015-06-27 03:43:47 -04:00
|
|
|
} else if (!strcasecmp(arg, "asc")) {
|
2014-05-12 14:38:17 -04:00
|
|
|
sort = SORT_ASC;
|
2015-06-27 03:43:47 -04:00
|
|
|
} else if (!strcasecmp(arg, "desc")) {
|
2014-05-12 14:38:17 -04:00
|
|
|
sort = SORT_DESC;
|
2015-10-06 03:25:28 -04:00
|
|
|
} else if (!strcasecmp(arg, "count") && (i+1) < remaining) {
|
2015-06-27 04:23:58 -04:00
|
|
|
if (getLongLongFromObjectOrReply(c, c->argv[base_args+i+1],
|
2015-07-26 17:17:55 -04:00
|
|
|
&count, NULL) != C_OK) return;
|
2015-06-27 04:23:58 -04:00
|
|
|
if (count <= 0) {
|
|
|
|
addReplyError(c,"COUNT must be > 0");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
i++;
|
2017-06-30 04:03:37 -04:00
|
|
|
} else if (!strcasecmp(arg, "store") &&
|
|
|
|
(i+1) < remaining &&
|
2020-12-11 19:21:05 -05:00
|
|
|
!(flags & RADIUS_NOSTORE) &&
|
|
|
|
!(flags & GEOSEARCH))
|
2017-06-30 04:03:37 -04:00
|
|
|
{
|
2016-02-18 04:24:11 -05:00
|
|
|
storekey = c->argv[base_args+i+1];
|
|
|
|
storedist = 0;
|
|
|
|
i++;
|
2017-06-30 04:03:37 -04:00
|
|
|
} else if (!strcasecmp(arg, "storedist") &&
|
|
|
|
(i+1) < remaining &&
|
2020-12-11 19:21:05 -05:00
|
|
|
!(flags & RADIUS_NOSTORE) &&
|
|
|
|
!(flags & GEOSEARCH))
|
2017-06-30 04:03:37 -04:00
|
|
|
{
|
2016-02-18 04:24:11 -05:00
|
|
|
storekey = c->argv[base_args+i+1];
|
|
|
|
storedist = 1;
|
|
|
|
i++;
|
2020-12-11 19:21:05 -05:00
|
|
|
} else if (!strcasecmp(arg, "storedist") &&
|
|
|
|
(flags & GEOSEARCH) &&
|
|
|
|
(flags & GEOSEARCHSTORE))
|
|
|
|
{
|
|
|
|
storedist = 1;
|
|
|
|
} else if (!strcasecmp(arg, "frommember") &&
|
|
|
|
(i+1) < remaining &&
|
|
|
|
flags & GEOSEARCH &&
|
|
|
|
!fromloc)
|
|
|
|
{
|
|
|
|
if (longLatFromMember(zobj, c->argv[base_args+i+1], shape.xy) == C_ERR) {
|
|
|
|
addReplyError(c, "could not decode requested zset member");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
frommember = 1;
|
|
|
|
i++;
|
2020-12-14 10:15:12 -05:00
|
|
|
} else if (!strcasecmp(arg, "fromlonlat") &&
|
2020-12-11 19:21:05 -05:00
|
|
|
(i+2) < remaining &&
|
|
|
|
flags & GEOSEARCH &&
|
|
|
|
!frommember)
|
|
|
|
{
|
|
|
|
if (extractLongLatOrReply(c, c->argv+base_args+i+1, shape.xy) == C_ERR) return;
|
|
|
|
fromloc = 1;
|
|
|
|
i += 2;
|
|
|
|
} else if (!strcasecmp(arg, "byradius") &&
|
|
|
|
(i+2) < remaining &&
|
|
|
|
flags & GEOSEARCH &&
|
|
|
|
!bybox)
|
|
|
|
{
|
|
|
|
if (extractDistanceOrReply(c, c->argv+base_args+i+1, &shape.conversion, &shape.t.radius) != C_OK)
|
|
|
|
return;
|
|
|
|
shape.type = CIRCULAR_TYPE;
|
|
|
|
byradius = 1;
|
|
|
|
i += 2;
|
|
|
|
} else if (!strcasecmp(arg, "bybox") &&
|
|
|
|
(i+3) < remaining &&
|
|
|
|
flags & GEOSEARCH &&
|
|
|
|
!byradius)
|
|
|
|
{
|
|
|
|
if (extractBoxOrReply(c, c->argv+base_args+i+1, &shape.conversion, &shape.t.r.height,
|
|
|
|
&shape.t.r.width) != C_OK) return;
|
|
|
|
shape.type = RECTANGLE_TYPE;
|
|
|
|
bybox = 1;
|
|
|
|
i += 3;
|
2015-06-27 03:43:47 -04:00
|
|
|
} else {
|
2014-05-12 14:38:17 -04:00
|
|
|
addReply(c, shared.syntaxerr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-02-18 04:24:11 -05:00
|
|
|
/* Trap options not compatible with STORE and STOREDIST. */
|
|
|
|
if (storekey && (withdist || withhash || withcoords)) {
|
|
|
|
addReplyError(c,
|
|
|
|
"STORE option in GEORADIUS is not compatible with "
|
|
|
|
"WITHDIST, WITHHASH and WITHCOORDS options");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-12-11 19:21:05 -05:00
|
|
|
if ((flags & GEOSEARCH) && !(frommember || fromloc)) {
|
2020-12-14 10:15:12 -05:00
|
|
|
addReplyErrorFormat(c,
|
|
|
|
"exactly one of FROMMEMBER or FROMLONLAT can be specified for %s",
|
|
|
|
(char *)c->argv[0]->ptr);
|
2020-12-11 19:21:05 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((flags & GEOSEARCH) && !(byradius || bybox)) {
|
2020-12-14 10:15:12 -05:00
|
|
|
addReplyErrorFormat(c,
|
|
|
|
"exactly one of BYRADIUS and BYBOX can be specified for %s",
|
|
|
|
(char *)c->argv[0]->ptr);
|
2020-12-11 19:21:05 -05:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-06-27 04:23:58 -04:00
|
|
|
/* COUNT without ordering does not make much sense, force ASC
|
|
|
|
* ordering if COUNT was specified but no sorting was requested. */
|
|
|
|
if (count != 0 && sort == SORT_NONE) sort = SORT_ASC;
|
|
|
|
|
2014-05-12 14:38:17 -04:00
|
|
|
/* Get all neighbor geohash boxes for our radius search */
|
2020-12-11 19:21:05 -05:00
|
|
|
GeoHashRadius georadius = geohashCalculateAreasByShapeWGS84(&shape);
|
2014-05-12 14:38:17 -04:00
|
|
|
|
|
|
|
/* Search the zset for all matching points */
|
2015-06-22 12:08:06 -04:00
|
|
|
geoArray *ga = geoArrayCreate();
|
2020-12-11 19:21:05 -05:00
|
|
|
membersOfAllNeighbors(zobj, georadius, &shape, ga);
|
2014-05-12 14:38:17 -04:00
|
|
|
|
|
|
|
/* If no matching results, the user gets an empty reply. */
|
2016-02-18 04:24:11 -05:00
|
|
|
if (ga->used == 0 && storekey == NULL) {
|
2019-10-01 13:18:08 -04:00
|
|
|
addReply(c,shared.emptyarray);
|
2015-06-22 12:08:06 -04:00
|
|
|
geoArrayFree(ga);
|
2014-05-12 14:38:17 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-06-22 12:08:06 -04:00
|
|
|
long result_length = ga->used;
|
2016-02-18 04:24:11 -05:00
|
|
|
long returned_items = (count == 0 || result_length < count) ?
|
|
|
|
result_length : count;
|
2014-05-12 14:38:17 -04:00
|
|
|
long option_length = 0;
|
|
|
|
|
|
|
|
/* Process [optional] requested sorting */
|
|
|
|
if (sort == SORT_ASC) {
|
2015-06-22 12:08:06 -04:00
|
|
|
qsort(ga->array, result_length, sizeof(geoPoint), sort_gp_asc);
|
2014-05-12 14:38:17 -04:00
|
|
|
} else if (sort == SORT_DESC) {
|
2015-06-22 12:08:06 -04:00
|
|
|
qsort(ga->array, result_length, sizeof(geoPoint), sort_gp_desc);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2016-02-18 04:24:11 -05:00
|
|
|
if (storekey == NULL) {
|
|
|
|
/* No target key, return results to user. */
|
2014-05-12 14:38:17 -04:00
|
|
|
|
2016-02-18 04:24:11 -05:00
|
|
|
/* Our options are self-contained nested multibulk replies, so we
|
|
|
|
* only need to track how many of those nested replies we return. */
|
2014-05-12 14:38:17 -04:00
|
|
|
if (withdist)
|
2016-02-18 04:24:11 -05:00
|
|
|
option_length++;
|
|
|
|
|
|
|
|
if (withcoords)
|
|
|
|
option_length++;
|
2014-05-12 14:38:17 -04:00
|
|
|
|
|
|
|
if (withhash)
|
2016-02-18 04:24:11 -05:00
|
|
|
option_length++;
|
|
|
|
|
2018-11-30 05:07:07 -05:00
|
|
|
/* The array len we send is exactly result_length. The result is
|
2016-02-18 04:24:11 -05:00
|
|
|
* either all strings of just zset members *or* a nested multi-bulk
|
|
|
|
* reply containing the zset member string _and_ all the additional
|
|
|
|
* options the user enabled for this request. */
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyArrayLen(c, returned_items);
|
2016-02-18 04:24:11 -05:00
|
|
|
|
|
|
|
/* Finally send results back to the caller */
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < returned_items; i++) {
|
|
|
|
geoPoint *gp = ga->array+i;
|
2020-12-11 19:21:05 -05:00
|
|
|
gp->dist /= shape.conversion; /* Fix according to unit. */
|
2016-02-18 04:24:11 -05:00
|
|
|
|
|
|
|
/* If we have options in option_length, return each sub-result
|
|
|
|
* as a nested multi-bulk. Add 1 to account for result value
|
|
|
|
* itself. */
|
|
|
|
if (option_length)
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyArrayLen(c, option_length + 1);
|
2016-02-18 04:24:11 -05:00
|
|
|
|
|
|
|
addReplyBulkSds(c,gp->member);
|
|
|
|
gp->member = NULL;
|
|
|
|
|
|
|
|
if (withdist)
|
|
|
|
addReplyDoubleDistance(c, gp->dist);
|
|
|
|
|
|
|
|
if (withhash)
|
|
|
|
addReplyLongLong(c, gp->score);
|
|
|
|
|
|
|
|
if (withcoords) {
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyArrayLen(c, 2);
|
2016-02-18 18:11:30 -05:00
|
|
|
addReplyHumanLongDouble(c, gp->longitude);
|
|
|
|
addReplyHumanLongDouble(c, gp->latitude);
|
2016-02-18 04:24:11 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Target key, create a sorted set with the results. */
|
|
|
|
robj *zobj;
|
|
|
|
zset *zs;
|
|
|
|
int i;
|
|
|
|
size_t maxelelen = 0;
|
|
|
|
|
|
|
|
if (returned_items) {
|
|
|
|
zobj = createZsetObject();
|
|
|
|
zs = zobj->ptr;
|
|
|
|
}
|
2014-05-12 14:38:17 -04:00
|
|
|
|
2016-02-18 04:24:11 -05:00
|
|
|
for (i = 0; i < returned_items; i++) {
|
|
|
|
zskiplistNode *znode;
|
|
|
|
geoPoint *gp = ga->array+i;
|
2020-12-11 19:21:05 -05:00
|
|
|
gp->dist /= shape.conversion; /* Fix according to unit. */
|
2016-02-18 04:24:11 -05:00
|
|
|
double score = storedist ? gp->dist : gp->score;
|
|
|
|
size_t elelen = sdslen(gp->member);
|
|
|
|
|
|
|
|
if (maxelelen < elelen) maxelelen = elelen;
|
|
|
|
znode = zslInsert(zs->zsl,score,gp->member);
|
|
|
|
serverAssert(dictAdd(zs->dict,gp->member,&znode->score) == DICT_OK);
|
|
|
|
gp->member = NULL;
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
2015-06-27 04:23:58 -04:00
|
|
|
|
2016-02-18 04:24:11 -05:00
|
|
|
if (returned_items) {
|
|
|
|
zsetConvertToZiplistIfNeeded(zobj,maxelelen);
|
2020-04-21 04:51:46 -04:00
|
|
|
setKey(c,c->db,storekey,zobj);
|
2016-02-18 04:24:11 -05:00
|
|
|
decrRefCount(zobj);
|
2020-12-11 19:21:05 -05:00
|
|
|
notifyKeyspaceEvent(NOTIFY_ZSET,flags & GEOSEARCH ? "geosearchstore" : "georadiusstore",storekey,
|
2016-02-18 04:24:11 -05:00
|
|
|
c->db->id);
|
|
|
|
server.dirty += returned_items;
|
|
|
|
} else if (dbDelete(c->db,storekey)) {
|
2020-04-21 04:51:46 -04:00
|
|
|
signalModifiedKey(c,c->db,storekey);
|
2016-02-18 04:24:11 -05:00
|
|
|
notifyKeyspaceEvent(NOTIFY_GENERIC,"del",storekey,c->db->id);
|
|
|
|
server.dirty++;
|
|
|
|
}
|
|
|
|
addReplyLongLong(c, returned_items);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
2015-06-22 12:08:06 -04:00
|
|
|
geoArrayFree(ga);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2015-06-29 03:16:27 -04:00
|
|
|
/* GEORADIUS wrapper function. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void georadiusCommand(client *c) {
|
2020-12-11 19:21:05 -05:00
|
|
|
georadiusGeneric(c, 1, RADIUS_COORDS);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2015-06-29 03:16:27 -04:00
|
|
|
/* GEORADIUSBYMEMBER wrapper function. */
|
2017-06-30 04:03:37 -04:00
|
|
|
void georadiusbymemberCommand(client *c) {
|
2020-12-11 19:21:05 -05:00
|
|
|
georadiusGeneric(c, 1, RADIUS_MEMBER);
|
2014-05-12 14:38:17 -04:00
|
|
|
}
|
|
|
|
|
2017-06-30 04:03:37 -04:00
|
|
|
/* GEORADIUS_RO wrapper function. */
|
|
|
|
void georadiusroCommand(client *c) {
|
2020-12-11 19:21:05 -05:00
|
|
|
georadiusGeneric(c, 1, RADIUS_COORDS|RADIUS_NOSTORE);
|
2017-06-30 04:03:37 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* GEORADIUSBYMEMBER_RO wrapper function. */
|
|
|
|
void georadiusbymemberroCommand(client *c) {
|
2020-12-11 19:21:05 -05:00
|
|
|
georadiusGeneric(c, 1, RADIUS_MEMBER|RADIUS_NOSTORE);
|
|
|
|
}
|
|
|
|
|
|
|
|
void geosearchCommand(client *c) {
|
|
|
|
georadiusGeneric(c, 1, GEOSEARCH);
|
|
|
|
}
|
|
|
|
|
|
|
|
void geosearchstoreCommand(client *c) {
|
|
|
|
georadiusGeneric(c, 2, GEOSEARCH|GEOSEARCHSTORE);
|
2017-06-30 04:03:37 -04:00
|
|
|
}
|
|
|
|
|
2015-06-24 10:31:14 -04:00
|
|
|
/* GEOHASH key ele1 ele2 ... eleN
|
|
|
|
*
|
|
|
|
* Returns an array with an 11 characters geohash representation of the
|
|
|
|
* position of the specified elements. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void geohashCommand(client *c) {
|
2015-06-24 10:31:14 -04:00
|
|
|
char *geoalphabet= "0123456789bcdefghjkmnpqrstuvwxyz";
|
|
|
|
int j;
|
|
|
|
|
|
|
|
/* Look up the requested zset */
|
2016-12-20 04:19:06 -05:00
|
|
|
robj *zobj = lookupKeyRead(c->db, c->argv[1]);
|
2020-08-11 23:04:54 -04:00
|
|
|
if (checkType(c, zobj, OBJ_ZSET)) return;
|
2015-06-24 10:31:14 -04:00
|
|
|
|
|
|
|
/* Geohash elements one after the other, using a null bulk reply for
|
|
|
|
* missing elements. */
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyArrayLen(c,c->argc-2);
|
2015-06-24 10:31:14 -04:00
|
|
|
for (j = 2; j < c->argc; j++) {
|
|
|
|
double score;
|
2016-12-20 04:19:06 -05:00
|
|
|
if (!zobj || zsetScore(zobj, c->argv[j]->ptr, &score) == C_ERR) {
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyNull(c);
|
2015-06-24 10:31:14 -04:00
|
|
|
} else {
|
|
|
|
/* The internal format we use for geocoding is a bit different
|
|
|
|
* than the standard, since we use as initial latitude range
|
|
|
|
* -85,85, while the normal geohashing algorithm uses -90,90.
|
|
|
|
* So we have to decode our position and re-encode using the
|
|
|
|
* standard ranges in order to output a valid geohash string. */
|
|
|
|
|
|
|
|
/* Decode... */
|
2015-06-25 12:05:45 -04:00
|
|
|
double xy[2];
|
|
|
|
if (!decodeGeohash(score,xy)) {
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyNull(c);
|
2015-06-24 10:31:14 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Re-encode */
|
|
|
|
GeoHashRange r[2];
|
|
|
|
GeoHashBits hash;
|
2015-06-25 12:05:45 -04:00
|
|
|
r[0].min = -180;
|
|
|
|
r[0].max = 180;
|
|
|
|
r[1].min = -90;
|
|
|
|
r[1].max = 90;
|
|
|
|
geohashEncode(&r[0],&r[1],xy[0],xy[1],26,&hash);
|
2015-06-24 10:31:14 -04:00
|
|
|
|
2019-12-18 06:54:46 -05:00
|
|
|
char buf[12];
|
2015-06-24 10:31:14 -04:00
|
|
|
int i;
|
2019-12-18 06:54:46 -05:00
|
|
|
for (i = 0; i < 11; i++) {
|
2019-12-18 06:57:32 -05:00
|
|
|
int idx;
|
|
|
|
if (i == 10) {
|
|
|
|
/* We have just 52 bits, but the API used to output
|
|
|
|
* an 11 bytes geohash. For compatibility we assume
|
|
|
|
* zero. */
|
|
|
|
idx = 0;
|
|
|
|
} else {
|
|
|
|
idx = (hash.bits >> (52-((i+1)*5))) & 0x1f;
|
|
|
|
}
|
2015-06-24 10:31:14 -04:00
|
|
|
buf[i] = geoalphabet[idx];
|
|
|
|
}
|
2019-12-18 06:54:46 -05:00
|
|
|
buf[11] = '\0';
|
|
|
|
addReplyBulkCBuffer(c,buf,11);
|
2015-06-24 10:31:14 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-06-29 04:47:07 -04:00
|
|
|
|
|
|
|
/* GEOPOS key ele1 ele2 ... eleN
|
|
|
|
*
|
|
|
|
* Returns an array of two-items arrays representing the x,y position of each
|
|
|
|
* element specified in the arguments. For missing elements NULL is returned. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void geoposCommand(client *c) {
|
2015-06-29 04:47:07 -04:00
|
|
|
int j;
|
|
|
|
|
|
|
|
/* Look up the requested zset */
|
2016-12-20 04:12:38 -05:00
|
|
|
robj *zobj = lookupKeyRead(c->db, c->argv[1]);
|
2020-08-11 23:04:54 -04:00
|
|
|
if (checkType(c, zobj, OBJ_ZSET)) return;
|
2015-06-29 04:47:07 -04:00
|
|
|
|
|
|
|
/* Report elements one after the other, using a null bulk reply for
|
|
|
|
* missing elements. */
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyArrayLen(c,c->argc-2);
|
2015-06-29 04:47:07 -04:00
|
|
|
for (j = 2; j < c->argc; j++) {
|
|
|
|
double score;
|
2016-12-20 04:12:38 -05:00
|
|
|
if (!zobj || zsetScore(zobj, c->argv[j]->ptr, &score) == C_ERR) {
|
2018-11-30 10:36:55 -05:00
|
|
|
addReplyNullArray(c);
|
2015-06-29 04:47:07 -04:00
|
|
|
} else {
|
|
|
|
/* Decode... */
|
|
|
|
double xy[2];
|
|
|
|
if (!decodeGeohash(score,xy)) {
|
2018-11-30 10:36:55 -05:00
|
|
|
addReplyNullArray(c);
|
2015-06-29 04:47:07 -04:00
|
|
|
continue;
|
|
|
|
}
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyArrayLen(c,2);
|
2016-02-18 18:11:30 -05:00
|
|
|
addReplyHumanLongDouble(c,xy[0]);
|
|
|
|
addReplyHumanLongDouble(c,xy[1]);
|
2015-06-29 04:47:07 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-06-29 06:44:31 -04:00
|
|
|
|
|
|
|
/* GEODIST key ele1 ele2 [unit]
|
|
|
|
*
|
Squash merging 125 typo/grammar/comment/doc PRs (#7773)
List of squashed commits or PRs
===============================
commit 66801ea
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Jan 13 00:54:31 2020 -0500
typo fix in acl.c
commit 46f55db
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun Sep 6 18:24:11 2020 +0300
Updates a couple of comments
Specifically:
* RM_AutoMemory completed instead of pointing to docs
* Updated link to custom type doc
commit 61a2aa0
Author: xindoo <xindoo@qq.com>
Date: Tue Sep 1 19:24:59 2020 +0800
Correct errors in code comments
commit a5871d1
Author: yz1509 <pro-756@qq.com>
Date: Tue Sep 1 18:36:06 2020 +0800
fix typos in module.c
commit 41eede7
Author: bookug <bookug@qq.com>
Date: Sat Aug 15 01:11:33 2020 +0800
docs: fix typos in comments
commit c303c84
Author: lazy-snail <ws.niu@outlook.com>
Date: Fri Aug 7 11:15:44 2020 +0800
fix spelling in redis.conf
commit 1eb76bf
Author: zhujian <zhujianxyz@gmail.com>
Date: Thu Aug 6 15:22:10 2020 +0800
add a missing 'n' in comment
commit 1530ec2
Author: Daniel Dai <764122422@qq.com>
Date: Mon Jul 27 00:46:35 2020 -0400
fix spelling in tracking.c
commit e517b31
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:32 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit c300eff
Author: Hunter-Chen <huntcool001@gmail.com>
Date: Fri Jul 17 22:33:23 2020 +0800
Update redis.conf
Co-authored-by: Itamar Haber <itamar@redislabs.com>
commit 4c058a8
Author: 陈浩鹏 <chenhaopeng@heytea.com>
Date: Thu Jun 25 19:00:56 2020 +0800
Grammar fix and clarification
commit 5fcaa81
Author: bodong.ybd <bodong.ybd@alibaba-inc.com>
Date: Fri Jun 19 10:09:00 2020 +0800
Fix typos
commit 4caca9a
Author: Pruthvi P <pruthvi@ixigo.com>
Date: Fri May 22 00:33:22 2020 +0530
Fix typo eviciton => eviction
commit b2a25f6
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Sun May 17 12:39:59 2020 -0400
Fix a typo.
commit 12842ae
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun May 3 17:16:59 2020 -0400
fix spelling in redis conf
commit ddba07c
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Sat May 2 23:25:34 2020 +0100
Correct a "conflicts" spelling error.
commit 8fc7bf2
Author: Nao YONASHIRO <yonashiro@r.recruit.co.jp>
Date: Thu Apr 30 10:25:27 2020 +0900
docs: fix EXPIRE_FAST_CYCLE_DURATION to ACTIVE_EXPIRE_CYCLE_FAST_DURATION
commit 9b2b67a
Author: Brad Dunbar <dunbarb2@gmail.com>
Date: Fri Apr 24 11:46:22 2020 -0400
Fix a typo.
commit 0746f10
Author: devilinrust <63737265+devilinrust@users.noreply.github.com>
Date: Thu Apr 16 00:17:53 2020 +0200
Fix typos in server.c
commit 92b588d
Author: benjessop12 <56115861+benjessop12@users.noreply.github.com>
Date: Mon Apr 13 13:43:55 2020 +0100
Fix spelling mistake in lazyfree.c
commit 1da37aa
Merge: 2d4ba28 af347a8
Author: hwware <wen.hui.ware@gmail.com>
Date: Thu Mar 5 22:41:31 2020 -0500
Merge remote-tracking branch 'upstream/unstable' into expiretypofix
commit 2d4ba28
Author: hwware <wen.hui.ware@gmail.com>
Date: Mon Mar 2 00:09:40 2020 -0500
fix typo in expire.c
commit 1a746f7
Author: SennoYuki <minakami1yuki@gmail.com>
Date: Thu Feb 27 16:54:32 2020 +0800
fix typo
commit 8599b1a
Author: dongheejeong <donghee950403@gmail.com>
Date: Sun Feb 16 20:31:43 2020 +0000
Fix typo in server.c
commit f38d4e8
Author: hwware <wen.hui.ware@gmail.com>
Date: Sun Feb 2 22:58:38 2020 -0500
fix typo in evict.c
commit fe143fc
Author: Leo Murillo <leonardo.murillo@gmail.com>
Date: Sun Feb 2 01:57:22 2020 -0600
Fix a few typos in redis.conf
commit 1ab4d21
Author: viraja1 <anchan.viraj@gmail.com>
Date: Fri Dec 27 17:15:58 2019 +0530
Fix typo in Latency API docstring
commit ca1f70e
Author: gosth <danxuedexing@qq.com>
Date: Wed Dec 18 15:18:02 2019 +0800
fix typo in sort.c
commit a57c06b
Author: ZYunH <zyunhjob@163.com>
Date: Mon Dec 16 22:28:46 2019 +0800
fix-zset-typo
commit b8c92b5
Author: git-hulk <hulk.website@gmail.com>
Date: Mon Dec 16 15:51:42 2019 +0800
FIX: typo in cluster.c, onformation->information
commit 9dd981c
Author: wujm2007 <jim.wujm@gmail.com>
Date: Mon Dec 16 09:37:52 2019 +0800
Fix typo
commit e132d7a
Author: Sebastien Williams-Wynn <s.williamswynn.mail@gmail.com>
Date: Fri Nov 15 00:14:07 2019 +0000
Minor typo change
commit 47f44d5
Author: happynote3966 <01ssrmikururudevice01@gmail.com>
Date: Mon Nov 11 22:08:48 2019 +0900
fix comment typo in redis-cli.c
commit b8bdb0d
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 18:00:17 2019 +0800
Fix a spelling mistake of comments in defragDictBucketCallback
commit 0def46a
Author: fulei <fulei@kuaishou.com>
Date: Wed Oct 16 13:09:27 2019 +0800
fix some spelling mistakes of comments in defrag.c
commit f3596fd
Author: Phil Rajchgot <tophil@outlook.com>
Date: Sun Oct 13 02:02:32 2019 -0400
Typo and grammar fixes
Redis and its documentation are great -- just wanted to submit a few corrections in the spirit of Hacktoberfest. Thanks for all your work on this project. I use it all the time and it works beautifully.
commit 2b928cd
Author: KangZhiDong <worldkzd@gmail.com>
Date: Sun Sep 1 07:03:11 2019 +0800
fix typos
commit 33aea14
Author: Axlgrep <axlgrep@gmail.com>
Date: Tue Aug 27 11:02:18 2019 +0800
Fixed eviction spelling issues
commit e282a80
Author: Simen Flatby <simen@oms.no>
Date: Tue Aug 20 15:25:51 2019 +0200
Update comments to reflect prop name
In the comments the prop is referenced as replica-validity-factor,
but it is really named cluster-replica-validity-factor.
commit 74d1f9a
Author: Jim Green <jimgreen2013@qq.com>
Date: Tue Aug 20 20:00:31 2019 +0800
fix comment error, the code is ok
commit eea1407
Author: Liao Tonglang <liaotonglang@gmail.com>
Date: Fri May 31 10:16:18 2019 +0800
typo fix
fix cna't to can't
commit 0da553c
Author: KAWACHI Takashi <tkawachi@gmail.com>
Date: Wed Jul 17 00:38:16 2019 +0900
Fix typo
commit 7fc8fb6
Author: Michael Prokop <mika@grml.org>
Date: Tue May 28 17:58:42 2019 +0200
Typo fixes
s/familar/familiar/
s/compatiblity/compatibility/
s/ ot / to /
s/itsef/itself/
commit 5f46c9d
Author: zhumoing <34539422+zhumoing@users.noreply.github.com>
Date: Tue May 21 21:16:50 2019 +0800
typo-fixes
typo-fixes
commit 321dfe1
Author: wxisme <850885154@qq.com>
Date: Sat Mar 16 15:10:55 2019 +0800
typo fix
commit b4fb131
Merge: 267e0e6 3df1eb8
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Fri Feb 8 22:55:45 2019 +0200
Merge branch 'unstable' of antirez/redis into unstable
commit 267e0e6
Author: Nikitas Bastas <nikitasbst@gmail.com>
Date: Wed Jan 30 21:26:04 2019 +0200
Minor typo fix
commit 30544e7
Author: inshal96 <39904558+inshal96@users.noreply.github.com>
Date: Fri Jan 4 16:54:50 2019 +0500
remove an extra 'a' in the comments
commit 337969d
Author: BrotherGao <yangdongheng11@gmail.com>
Date: Sat Dec 29 12:37:29 2018 +0800
fix typo in redis.conf
commit 9f4b121
Merge: 423a030 e504583
Author: BrotherGao <yangdongheng@xiaomi.com>
Date: Sat Dec 29 11:41:12 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 423a030
Merge: 42b02b7 46a51cd
Author: 杨东衡 <yangdongheng@xiaomi.com>
Date: Tue Dec 4 23:56:11 2018 +0800
Merge branch 'unstable' of antirez/redis into unstable
commit 42b02b7
Merge: 68c0e6e b8febe6
Author: Dongheng Yang <yangdongheng11@gmail.com>
Date: Sun Oct 28 15:54:23 2018 +0800
Merge pull request #1 from antirez/unstable
update local data
commit 714b589
Author: Christian <crifei93@gmail.com>
Date: Fri Dec 28 01:17:26 2018 +0100
fix typo "resulution"
commit e23259d
Author: garenchan <1412950785@qq.com>
Date: Wed Dec 26 09:58:35 2018 +0800
fix typo: segfauls -> segfault
commit a9359f8
Author: xjp <jianping_xie@aliyun.com>
Date: Tue Dec 18 17:31:44 2018 +0800
Fixed REDISMODULE_H spell bug
commit a12c3e4
Author: jdiaz <jrd.palacios@gmail.com>
Date: Sat Dec 15 23:39:52 2018 -0600
Fixes hyperloglog hash function comment block description
commit 770eb11
Author: 林上耀 <1210tom@163.com>
Date: Sun Nov 25 17:16:10 2018 +0800
fix typo
commit fd97fbb
Author: Chris Lamb <chris@chris-lamb.co.uk>
Date: Fri Nov 23 17:14:01 2018 +0100
Correct "unsupported" typo.
commit a85522d
Author: Jungnam Lee <jungnam.lee@oracle.com>
Date: Thu Nov 8 23:01:29 2018 +0900
fix typo in test comments
commit ade8007
Author: Arun Kumar <palerdot@users.noreply.github.com>
Date: Tue Oct 23 16:56:35 2018 +0530
Fixed grammatical typo
Fixed typo for word 'dictionary'
commit 869ee39
Author: Hamid Alaei <hamid.a85@gmail.com>
Date: Sun Aug 12 16:40:02 2018 +0430
fix documentations: (ThreadSafeContextStart/Stop -> ThreadSafeContextLock/Unlock), minor typo
commit f89d158
Author: Mayank Jain <mayankjain255@gmail.com>
Date: Tue Jul 31 23:01:21 2018 +0530
Updated README.md with some spelling corrections.
Made correction in spelling of some misspelled words.
commit 892198e
Author: dsomeshwar <someshwar.dhayalan@gmail.com>
Date: Sat Jul 21 23:23:04 2018 +0530
typo fix
commit 8a4d780
Author: Itamar Haber <itamar@redislabs.com>
Date: Mon Apr 30 02:06:52 2018 +0300
Fixes some typos
commit e3acef6
Author: Noah Rosamilia <ivoahivoah@gmail.com>
Date: Sat Mar 3 23:41:21 2018 -0500
Fix typo in /deps/README.md
commit 04442fb
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:32:42 2018 +0800
Fix typo in readSyncBulkPayload() comment.
commit 9f36880
Author: WuYunlong <xzsyeb@126.com>
Date: Sat Mar 3 10:20:37 2018 +0800
replication.c comment: run_id -> replid.
commit f866b4a
Author: Francesco 'makevoid' Canessa <makevoid@gmail.com>
Date: Thu Feb 22 22:01:56 2018 +0000
fix comment typo in server.c
commit 0ebc69b
Author: 줍 <jubee0124@gmail.com>
Date: Mon Feb 12 16:38:48 2018 +0900
Fix typo in redis.conf
Fix `five behaviors` to `eight behaviors` in [this sentence ](antirez/redis@unstable/redis.conf#L564)
commit b50a620
Author: martinbroadhurst <martinbroadhurst@users.noreply.github.com>
Date: Thu Dec 28 12:07:30 2017 +0000
Fix typo in valgrind.sup
commit 7d8f349
Author: Peter Boughton <peter@sorcerersisle.com>
Date: Mon Nov 27 19:52:19 2017 +0000
Update CONTRIBUTING; refer doc updates to redis-doc repo.
commit 02dec7e
Author: Klauswk <klauswk1@hotmail.com>
Date: Tue Oct 24 16:18:38 2017 -0200
Fix typo in comment
commit e1efbc8
Author: chenshi <baiwfg2@gmail.com>
Date: Tue Oct 3 18:26:30 2017 +0800
Correct two spelling errors of comments
commit 93327d8
Author: spacewander <spacewanderlzx@gmail.com>
Date: Wed Sep 13 16:47:24 2017 +0800
Update the comment for OBJ_ENCODING_EMBSTR_SIZE_LIMIT's value
The value of OBJ_ENCODING_EMBSTR_SIZE_LIMIT is 44 now instead of 39.
commit 63d361f
Author: spacewander <spacewanderlzx@gmail.com>
Date: Tue Sep 12 15:06:42 2017 +0800
Fix <prevlen> related doc in ziplist.c
According to the definition of ZIP_BIG_PREVLEN and other related code,
the guard of single byte <prevlen> should be 254 instead of 255.
commit ebe228d
Author: hanael80 <hanael80@gmail.com>
Date: Tue Aug 15 09:09:40 2017 +0900
Fix typo
commit 6b696e6
Author: Matt Robenolt <matt@ydekproductions.com>
Date: Mon Aug 14 14:50:47 2017 -0700
Fix typo in LATENCY DOCTOR output
commit a2ec6ae
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 15 14:15:16 2017 +0800
Fix a typo: form => from
commit 3ab7699
Author: caosiyang <caosiyang@qiyi.com>
Date: Thu Aug 10 18:40:33 2017 +0800
Fix a typo: replicationFeedSlavesFromMaster() => replicationFeedSlavesFromMasterStream()
commit 72d43ef
Author: caosiyang <caosiyang@qiyi.com>
Date: Tue Aug 8 15:57:25 2017 +0800
fix a typo: servewr => server
commit 707c958
Author: Bo Cai <charpty@gmail.com>
Date: Wed Jul 26 21:49:42 2017 +0800
redis-cli.c typo: conut -> count.
Signed-off-by: Bo Cai <charpty@gmail.com>
commit b9385b2
Author: JackDrogon <jack.xsuperman@gmail.com>
Date: Fri Jun 30 14:22:31 2017 +0800
Fix some spell problems
commit 20d9230
Author: akosel <aaronjkosel@gmail.com>
Date: Sun Jun 4 19:35:13 2017 -0500
Fix typo
commit b167bfc
Author: Krzysiek Witkowicz <krzysiekwitkowicz@gmail.com>
Date: Mon May 22 21:32:27 2017 +0100
Fix #4008 small typo in comment
commit 2b78ac8
Author: Jake Clarkson <jacobwclarkson@gmail.com>
Date: Wed Apr 26 15:49:50 2017 +0100
Correct typo in tests/unit/hyperloglog.tcl
commit b0f1cdb
Author: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed Apr 19 14:25:18 2017 -0700
Fix typo
commit a90b0f9
Author: charsyam <charsyam@naver.com>
Date: Thu Mar 16 18:19:53 2017 +0900
fix typos
fix typos
fix typos
commit 8430a79
Author: Richard Hart <richardhart92@gmail.com>
Date: Mon Mar 13 22:17:41 2017 -0400
Fixed log message typo in listenToPort.
commit 481a1c2
Author: Vinod Kumar <kumar003vinod@gmail.com>
Date: Sun Jan 15 23:04:51 2017 +0530
src/db.c: Correct "save" -> "safe" typo
commit 586b4d3
Author: wangshaonan <wshn13@gmail.com>
Date: Wed Dec 21 20:28:27 2016 +0800
Fix typo they->the in helloworld.c
commit c1c4b5e
Author: Jenner <hypxm@qq.com>
Date: Mon Dec 19 16:39:46 2016 +0800
typo error
commit 1ee1a3f
Author: tielei <43289893@qq.com>
Date: Mon Jul 18 13:52:25 2016 +0800
fix some comments
commit 11a41fb
Author: Otto Kekäläinen <otto@seravo.fi>
Date: Sun Jul 3 10:23:55 2016 +0100
Fix spelling in documentation and comments
commit 5fb5d82
Author: francischan <f1ancis621@gmail.com>
Date: Tue Jun 28 00:19:33 2016 +0800
Fix outdated comments about redis.c file.
It should now refer to server.c file.
commit 6b254bc
Author: lmatt-bit <lmatt123n@gmail.com>
Date: Thu Apr 21 21:45:58 2016 +0800
Refine the comment of dictRehashMilliseconds func
SLAVECONF->REPLCONF in comment - by andyli029
commit ee9869f
Author: clark.kang <charsyam@naver.com>
Date: Tue Mar 22 11:09:51 2016 +0900
fix typos
commit f7b3b11
Author: Harisankar H <harisankarh@gmail.com>
Date: Wed Mar 9 11:49:42 2016 +0530
Typo correction: "faield" --> "failed"
Typo correction: "faield" --> "failed"
commit 3fd40fc
Author: Itamar Haber <itamar@redislabs.com>
Date: Thu Feb 25 10:31:51 2016 +0200
Fixes a typo in comments
commit 621c160
Author: Prayag Verma <prayag.verma@gmail.com>
Date: Mon Feb 1 12:36:20 2016 +0530
Fix typo in Readme.md
Spelling mistakes -
`eviciton` > `eviction`
`familar` > `familiar`
commit d7d07d6
Author: WonCheol Lee <toctoc21c@gmail.com>
Date: Wed Dec 30 15:11:34 2015 +0900
Typo fixed
commit a4dade7
Author: Felix Bünemann <buenemann@louis.info>
Date: Mon Dec 28 11:02:55 2015 +0100
[ci skip] Improve supervised upstart config docs
This mentions that "expect stop" is required for supervised upstart
to work correctly. See http://upstart.ubuntu.com/cookbook/#expect-stop
for an explanation.
commit d9caba9
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:30:03 2015 +1100
README: Remove trailing whitespace
commit 72d42e5
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:32 2015 +1100
README: Fix typo. th => the
commit dd6e957
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:29:20 2015 +1100
README: Fix typo. familar => familiar
commit 3a12b23
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:28:54 2015 +1100
README: Fix typo. eviciton => eviction
commit 2d1d03b
Author: daurnimator <quae@daurnimator.com>
Date: Mon Dec 21 18:21:45 2015 +1100
README: Fix typo. sever => server
commit 3973b06
Author: Itamar Haber <itamar@garantiadata.com>
Date: Sat Dec 19 17:01:20 2015 +0200
Typo fix
commit 4f2e460
Author: Steve Gao <fu@2token.com>
Date: Fri Dec 4 10:22:05 2015 +0800
Update README - fix typos
commit b21667c
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:48:37 2015 +0800
delete redundancy color judge in sdscatcolor
commit 88894c7
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 22:14:42 2015 +0800
the example output shoule be HelloWorld
commit 2763470
Author: binyan <binbin.yan@nokia.com>
Date: Wed Dec 2 17:41:39 2015 +0800
modify error word keyevente
Signed-off-by: binyan <binbin.yan@nokia.com>
commit 0847b3d
Author: Bruno Martins <bscmartins@gmail.com>
Date: Wed Nov 4 11:37:01 2015 +0000
typo
commit bbb9e9e
Author: dawedawe <dawedawe@gmx.de>
Date: Fri Mar 27 00:46:41 2015 +0100
typo: zimap -> zipmap
commit 5ed297e
Author: Axel Advento <badwolf.bloodseeker.rev@gmail.com>
Date: Tue Mar 3 15:58:29 2015 +0800
Fix 'salve' typos to 'slave'
commit edec9d6
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Wed Jun 12 14:12:47 2019 +0200
Update README.md
Co-Authored-By: Qix <Qix-@users.noreply.github.com>
commit 692a7af
Author: LudwikJaniuk <ludvig.janiuk@gmail.com>
Date: Tue May 28 14:32:04 2019 +0200
grammar
commit d962b0a
Author: Nick Frost <nickfrostatx@gmail.com>
Date: Wed Jul 20 15:17:12 2016 -0700
Minor grammar fix
commit 24fff01aaccaf5956973ada8c50ceb1462e211c6 (typos)
Author: Chad Miller <chadm@squareup.com>
Date: Tue Sep 8 13:46:11 2020 -0400
Fix faulty comment about operation of unlink()
commit 3cd5c1f3326c52aa552ada7ec797c6bb16452355
Author: Kevin <kevin.xgr@gmail.com>
Date: Wed Nov 20 00:13:50 2019 +0800
Fix typo in server.c.
From a83af59 Mon Sep 17 00:00:00 2001
From: wuwo <wuwo@wacai.com>
Date: Fri, 17 Mar 2017 20:37:45 +0800
Subject: [PATCH] falure to failure
From c961896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=A6=E6=87=B6?= <veficos@gmail.com>
Date: Sat, 27 May 2017 15:33:04 +0800
Subject: [PATCH] fix typo
From e600ef2 Mon Sep 17 00:00:00 2001
From: "rui.zou" <rui.zou@yunify.com>
Date: Sat, 30 Sep 2017 12:38:15 +0800
Subject: [PATCH] fix a typo
From c7d07fa Mon Sep 17 00:00:00 2001
From: Alexandre Perrin <alex@kaworu.ch>
Date: Thu, 16 Aug 2018 10:35:31 +0200
Subject: [PATCH] deps README.md typo
From b25cb67 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 10:55:37 +0300
Subject: [PATCH 1/2] fix typos in header
From ad28ca6 Mon Sep 17 00:00:00 2001
From: Guy Korland <gkorland@gmail.com>
Date: Wed, 26 Sep 2018 11:02:36 +0300
Subject: [PATCH 2/2] fix typos
commit 34924cdedd8552466fc22c1168d49236cb7ee915
Author: Adrian Lynch <adi_ady_ade@hotmail.com>
Date: Sat Apr 4 21:59:15 2015 +0100
Typos fixed
commit fd2a1e7
Author: Jan <jsteemann@users.noreply.github.com>
Date: Sat Oct 27 19:13:01 2018 +0200
Fix typos
Fix typos
commit e14e47c1a234b53b0e103c5f6a1c61481cbcbb02
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:30:07 2019 -0500
Fix multiple misspellings of "following"
commit 79b948ce2dac6b453fe80995abbcaac04c213d5a
Author: Andy Lester <andy@petdance.com>
Date: Fri Aug 2 22:24:28 2019 -0500
Fix misspelling of create-cluster
commit 1fffde52666dc99ab35efbd31071a4c008cb5a71
Author: Andy Lester <andy@petdance.com>
Date: Wed Jul 31 17:57:56 2019 -0500
Fix typos
commit 204c9ba9651e9e05fd73936b452b9a30be456cfe
Author: Xiaobo Zhu <xiaobo.zhu@shopee.com>
Date: Tue Aug 13 22:19:25 2019 +0800
fix typos
Squashed commit of the following:
commit 1d9aaf8
Author: danmedani <danmedani@gmail.com>
Date: Sun Aug 2 11:40:26 2015 -0700
README typo fix.
Squashed commit of the following:
commit 32bfa7c
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Jul 6 21:15:08 2015 +0200
Fixed grammer
Squashed commit of the following:
commit b24f69c
Author: Sisir Koppaka <sisir.koppaka@gmail.com>
Date: Mon Mar 2 22:38:45 2015 -0500
utils/hashtable/rehashing.c: Fix typos
Squashed commit of the following:
commit 4e04082
Author: Erik Dubbelboer <erik@dubbelboer.com>
Date: Mon Mar 23 08:22:21 2015 +0000
Small config file documentation improvements
Squashed commit of the following:
commit acb8773
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:52:48 2015 -0700
Typo and grammar fixes in readme
commit 2eb75b6
Author: ctd1500 <ctd1500@gmail.com>
Date: Fri May 8 01:36:18 2015 -0700
fixed redis.conf comment
Squashed commit of the following:
commit a8249a2
Author: Masahiko Sawada <sawada.mshk@gmail.com>
Date: Fri Dec 11 11:39:52 2015 +0530
Revise correction of typos.
Squashed commit of the following:
commit 3c02028
Author: zhaojun11 <zhaojun11@jd.com>
Date: Wed Jan 17 19:05:28 2018 +0800
Fix typos include two code typos in cluster.c and latency.c
Squashed commit of the following:
commit 9dba47c
Author: q191201771 <191201771@qq.com>
Date: Sat Jan 4 11:31:04 2020 +0800
fix function listCreate comment in adlist.c
Update src/server.c
commit 2c7c2cb536e78dd211b1ac6f7bda00f0f54faaeb
Author: charpty <charpty@gmail.com>
Date: Tue May 1 23:16:59 2018 +0800
server.c typo: modules system dictionary type comment
Signed-off-by: charpty <charpty@gmail.com>
commit a8395323fb63cb59cb3591cb0f0c8edb7c29a680
Author: Itamar Haber <itamar@redislabs.com>
Date: Sun May 6 00:25:18 2018 +0300
Updates test_helper.tcl's help with undocumented options
Specifically:
* Host
* Port
* Client
commit bde6f9ced15755cd6407b4af7d601b030f36d60b
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 15:19:19 2018 +0800
fix comments in deps files
commit 3172474ba991532ab799ee1873439f3402412331
Author: wxisme <850885154@qq.com>
Date: Wed Aug 8 14:33:49 2018 +0800
fix some comments
commit 01b6f2b6858b5cf2ce4ad5092d2c746e755f53f0
Author: Thor Juhasz <thor@juhasz.pro>
Date: Sun Nov 18 14:37:41 2018 +0100
Minor fixes to comments
Found some parts a little unclear on a first read, which prompted me to have a better look at the file and fix some minor things I noticed.
Fixing minor typos and grammar. There are no changes to configuration options.
These changes are only meant to help the user better understand the explanations to the various configuration options
2020-09-10 06:43:38 -04:00
|
|
|
* Return the distance, in meters by default, otherwise according to "unit",
|
2015-06-29 06:44:31 -04:00
|
|
|
* between points ele1 and ele2. If one or more elements are missing NULL
|
|
|
|
* is returned. */
|
2015-07-26 09:20:46 -04:00
|
|
|
void geodistCommand(client *c) {
|
2015-06-29 06:44:31 -04:00
|
|
|
double to_meter = 1;
|
|
|
|
|
|
|
|
/* Check if there is the unit to extract, otherwise assume meters. */
|
|
|
|
if (c->argc == 5) {
|
|
|
|
to_meter = extractUnitOrReply(c,c->argv[4]);
|
|
|
|
if (to_meter < 0) return;
|
|
|
|
} else if (c->argc > 5) {
|
|
|
|
addReply(c,shared.syntaxerr);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Look up the requested zset */
|
|
|
|
robj *zobj = NULL;
|
2018-11-30 05:07:07 -05:00
|
|
|
if ((zobj = lookupKeyReadOrReply(c, c->argv[1], shared.null[c->resp]))
|
2015-07-26 09:28:00 -04:00
|
|
|
== NULL || checkType(c, zobj, OBJ_ZSET)) return;
|
2015-06-29 06:44:31 -04:00
|
|
|
|
|
|
|
/* Get the scores. We need both otherwise NULL is returned. */
|
|
|
|
double score1, score2, xyxy[4];
|
2015-08-04 03:20:55 -04:00
|
|
|
if (zsetScore(zobj, c->argv[2]->ptr, &score1) == C_ERR ||
|
|
|
|
zsetScore(zobj, c->argv[3]->ptr, &score2) == C_ERR)
|
2015-06-29 06:44:31 -04:00
|
|
|
{
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyNull(c);
|
2015-06-29 06:44:31 -04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Decode & compute the distance. */
|
|
|
|
if (!decodeGeohash(score1,xyxy) || !decodeGeohash(score2,xyxy+2))
|
2018-11-30 05:07:07 -05:00
|
|
|
addReplyNull(c);
|
2015-06-29 06:44:31 -04:00
|
|
|
else
|
2016-02-18 18:00:39 -05:00
|
|
|
addReplyDoubleDistance(c,
|
2015-06-29 06:44:31 -04:00
|
|
|
geohashGetDistance(xyxy[0],xyxy[1],xyxy[2],xyxy[3]) / to_meter);
|
|
|
|
}
|