caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 16:18:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Geo: return REDIS_* where appropriate, improve commenting

Browse Source
This commit is contained in:
antirez 2015-06-23 10:27:45 +02:00
parent 0425c60381
commit 8d5ad19d15
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/geo.c
View File

@ -88,30 +88,37 @@ static inline int decodeGeohash(double bits, double *latlong) {
} }
/* Input Argument Helper */ /* Input Argument Helper */
/* Take a pointer to the latitude arg then use the next arg for longitude */ /* Take a pointer to the latitude arg then use the next arg for longitude.
* On parse error REDIS_ERR is returned, otherwise REDIS_OK. */
static inline int extractLatLongOrReply(redisClient *c, robj **argv, static inline int extractLatLongOrReply(redisClient *c, robj **argv,
double *latlong) { double *latlong) {
for (int i = 0; i < 2; i++) { for (int i = 0; i < 2; i++) {
if (getDoubleFromObjectOrReply(c, argv[i], latlong + i, NULL) != if (getDoubleFromObjectOrReply(c, argv[i], latlong + i, NULL) !=
REDIS_OK) { REDIS_OK) {
return 0; return REDIS_ERR;
} }
} }
return 1; return REDIS_OK;
} }
/* Input Argument Helper */ /* Input Argument Helper */
/* Decode lat/long from a zset member's score. /* Decode lat/long from a zset member's score.
* Returns non-zero on successful decoding. */ * Returns REDIS_OK on successful decoding, otherwise REDIS_ERR is returned. */
static int latLongFromMember(robj *zobj, robj *member, double *latlong) { static int latLongFromMember(robj *zobj, robj *member, double *latlong) {
double score = 0; double score = 0;
if (zsetScore(zobj, member, &score) == REDIS_ERR) return 0; if (zsetScore(zobj, member, &score) == REDIS_ERR) return REDIS_ERR;
if (!decodeGeohash(score, latlong)) return 0; if (!decodeGeohash(score, latlong)) return REDIS_ERR;
return 1; return REDIS_OK;
} }
/* Input Argument Helper */ /* Input Argument Helper.
* Extract the dinstance from the specified two arguments starting at 'argv'
* that shouldbe in the form: <number> <unit> and return the dinstance in the
* specified unit on success. *conversino is populated with the coefficient
* to use in order to convert meters to the unit.
*
* On error a value less than zero is returned. */
static double extractDistanceOrReply(redisClient *c, robj **argv, static double extractDistanceOrReply(redisClient *c, robj **argv,
double *conversion) { double *conversion) {
double distance; double distance;
@ -351,7 +358,7 @@ void geoAddCommand(redisClient *c) {
for (i = 0; i < elements; i++) { for (i = 0; i < elements; i++) {
double latlong[elements * 2]; double latlong[elements * 2];
if (!extractLatLongOrReply(c, (c->argv+2)+(i*3),latlong)) { if (extractLatLongOrReply(c, (c->argv+2)+(i*3),latlong) == REDIS_ERR) {
for (i = 0; i < argc; i++) for (i = 0; i < argc; i++)
if (argv[i]) decrRefCount(argv[i]); if (argv[i]) decrRefCount(argv[i]);
zfree(argv); zfree(argv);
@ -405,12 +412,12 @@ static void geoRadiusGeneric(redisClient *c, int type) {
double latlong[2] = { 0 }; double latlong[2] = { 0 };
if (type == RADIUS_COORDS) { if (type == RADIUS_COORDS) {
base_args = 6; base_args = 6;
if (!extractLatLongOrReply(c, c->argv + 2, latlong)) if (extractLatLongOrReply(c, c->argv + 2, latlong) == REDIS_ERR)
return; return;
} else if (type == RADIUS_MEMBER) { } else if (type == RADIUS_MEMBER) {
base_args = 5; base_args = 5;
robj *member = c->argv[2]; robj *member = c->argv[2];
if (!latLongFromMember(zobj, member, latlong)) { if (latLongFromMember(zobj, member, latlong) == REDIS_ERR) {
addReplyError(c, "could not decode requested zset member"); addReplyError(c, "could not decode requested zset member");
return; return;
} }
@ -587,7 +594,7 @@ void geoEncodeCommand(redisClient *c) {
} }
double latlong[2]; double latlong[2];
if (!extractLatLongOrReply(c, c->argv + 1, latlong)) return; if (extractLatLongOrReply(c, c->argv + 1, latlong) == REDIS_ERR) return;
/* Encode lat/long into our geohash */ /* Encode lat/long into our geohash */
GeoHashBits geohash; GeoHashBits geohash;