-
Notifications
You must be signed in to change notification settings - Fork 1.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support GEO #59
Merged
Merged
Support GEO #59
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
399a7cf
Support GEO
caa8708
format code
408e9cd
redis protocol compatible
c78502b
Support GEORADIUS AND GEORADIUSBYMEMBER
46ce746
fix warn
eadd063
modify flags
095579d
compatible with redis protocol
1347b55
bugfix
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next
Next commit
Support GEO
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
// Copyright (c) 2015-present, Qihoo, Inc. All rights reserved. | ||
// This source code is licensed under the BSD-style license found in the | ||
// LICENSE file in the root directory of this source tree. An additional grant | ||
// of patent rights can be found in the PATENTS file in the same directory. | ||
|
||
#ifndef PIKA_GEO_H_ | ||
#define PIKA_GEO_H_ | ||
#include "pika_command.h" | ||
#include "nemo.h" | ||
|
||
|
||
/* | ||
* zset | ||
*/ | ||
|
||
struct GeoPoint { | ||
std::string name; | ||
double longitude; | ||
double latitude; | ||
}; | ||
|
||
class GeoAddCmd : public Cmd { | ||
public: | ||
GeoAddCmd() {} | ||
virtual void Do(); | ||
private: | ||
std::string key_; | ||
std::vector<GeoPoint> pos_; | ||
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info); | ||
}; | ||
|
||
class GeoPosCmd : public Cmd { | ||
public: | ||
GeoPosCmd() {} | ||
virtual void Do(); | ||
private: | ||
std::string key_; | ||
std::vector<std::string> name_; | ||
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info); | ||
}; | ||
|
||
class GeoDistCmd : public Cmd { | ||
public: | ||
GeoDistCmd() {} | ||
virtual void Do(); | ||
private: | ||
std::string key_, first_pos_, second_pos_, unit_; | ||
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info); | ||
}; | ||
|
||
class GeoHashCmd : public Cmd { | ||
public: | ||
GeoHashCmd() {} | ||
virtual void Do(); | ||
private: | ||
std::string key_; | ||
std::vector<std::string> name_; | ||
virtual void DoInitial(PikaCmdArgsType &argvs, const CmdInfo* const ptr_info); | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
/* | ||
* Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com> | ||
* Copyright (c) 2014, Matt Stancliff <matt@genges.com>. | ||
* Copyright (c) 2015, Salvatore Sanfilippo <antirez@gmail.com>. | ||
* 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. | ||
*/ | ||
|
||
#ifndef GEOHASH_H_ | ||
#define GEOHASH_H_ | ||
|
||
#include <stddef.h> | ||
#include <stdint.h> | ||
#include <stdint.h> | ||
|
||
#if defined(__cplusplus) | ||
extern "C" { | ||
#endif | ||
|
||
#define HASHISZERO(r) (!(r).bits && !(r).step) | ||
#define RANGEISZERO(r) (!(r).max && !(r).min) | ||
#define RANGEPISZERO(r) (r == NULL || RANGEISZERO(*r)) | ||
|
||
#define GEO_STEP_MAX 18 /* 26*2 = 52 bits. */ | ||
|
||
/* Limits from EPSG:900913 / EPSG:3785 / OSGEO:41001 */ | ||
#define GEO_LAT_MIN -85.05112878 | ||
#define GEO_LAT_MAX 85.05112878 | ||
#define GEO_LONG_MIN -180 | ||
#define GEO_LONG_MAX 180 | ||
|
||
typedef enum { | ||
GEOHASH_NORTH = 0, | ||
GEOHASH_EAST, | ||
GEOHASH_WEST, | ||
GEOHASH_SOUTH, | ||
GEOHASH_SOUTH_WEST, | ||
GEOHASH_SOUTH_EAST, | ||
GEOHASH_NORT_WEST, | ||
GEOHASH_NORT_EAST | ||
} GeoDirection; | ||
|
||
typedef struct { | ||
uint64_t bits; | ||
uint8_t step; | ||
} GeoHashBits; | ||
|
||
typedef struct { | ||
double min; | ||
double max; | ||
} GeoHashRange; | ||
|
||
typedef struct { | ||
GeoHashBits hash; | ||
GeoHashRange longitude; | ||
GeoHashRange latitude; | ||
} GeoHashArea; | ||
|
||
typedef struct { | ||
GeoHashBits north; | ||
GeoHashBits east; | ||
GeoHashBits west; | ||
GeoHashBits south; | ||
GeoHashBits north_east; | ||
GeoHashBits south_east; | ||
GeoHashBits north_west; | ||
GeoHashBits south_west; | ||
} GeoHashNeighbors; | ||
|
||
/* | ||
* 0:success | ||
* -1:failed | ||
*/ | ||
void geohashGetCoordRange(GeoHashRange *long_range, GeoHashRange *lat_range); | ||
int geohashEncode(const GeoHashRange *long_range, const GeoHashRange *lat_range, | ||
double longitude, double latitude, uint8_t step, | ||
GeoHashBits *hash); | ||
int geohashEncodeType(double longitude, double latitude, | ||
uint8_t step, GeoHashBits *hash); | ||
int geohashEncodeWGS84(double longitude, double latitude, uint8_t step, | ||
GeoHashBits *hash); | ||
int geohashDecode(const GeoHashRange long_range, const GeoHashRange lat_range, | ||
const GeoHashBits hash, GeoHashArea *area); | ||
int geohashDecodeType(const GeoHashBits hash, GeoHashArea *area); | ||
int geohashDecodeWGS84(const GeoHashBits hash, GeoHashArea *area); | ||
int geohashDecodeAreaToLongLat(const GeoHashArea *area, double *xy); | ||
int geohashDecodeToLongLatType(const GeoHashBits hash, double *xy); | ||
int geohashDecodeToLongLatWGS84(const GeoHashBits hash, double *xy); | ||
int geohashDecodeToLongLatMercator(const GeoHashBits hash, double *xy); | ||
void geohashNeighbors(const GeoHashBits *hash, GeoHashNeighbors *neighbors); | ||
|
||
#if defined(__cplusplus) | ||
} | ||
#endif | ||
#endif /* GEOHASH_H_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/* | ||
* Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com> | ||
* Copyright (c) 2014, Matt Stancliff <matt@genges.com>. | ||
* Copyright (c) 2015, Salvatore Sanfilippo <antirez@gmail.com>. | ||
* 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. | ||
*/ | ||
|
||
#ifndef GEOHASH_HELPER_HPP_ | ||
#define GEOHASH_HELPER_HPP_ | ||
|
||
#include "pika_geohash.h" | ||
|
||
#define GZERO(s) s.bits = s.step = 0; | ||
#define GISZERO(s) (!s.bits && !s.step) | ||
#define GISNOTZERO(s) (s.bits || s.step) | ||
|
||
typedef uint64_t GeoHashFix52Bits; | ||
typedef uint64_t GeoHashVarBits; | ||
|
||
typedef struct { | ||
GeoHashBits hash; | ||
GeoHashArea area; | ||
GeoHashNeighbors neighbors; | ||
} GeoHashRadius; | ||
|
||
int GeoHashBitsComparator(const GeoHashBits *a, const GeoHashBits *b); | ||
uint8_t geohashEstimateStepsByRadius(double range_meters, double lat); | ||
int geohashBoundingBox(double longitude, double latitude, double radius_meters, | ||
double *bounds); | ||
GeoHashRadius geohashGetAreasByRadius(double longitude, | ||
double latitude, double radius_meters); | ||
GeoHashRadius geohashGetAreasByRadiusWGS84(double longitude, double latitude, | ||
double radius_meters); | ||
GeoHashRadius geohashGetAreasByRadiusMercator(double longitude, double latitude, | ||
double radius_meters); | ||
GeoHashFix52Bits geohashAlign52Bits(const GeoHashBits hash); | ||
double geohashGetDistance(double lon1d, double lat1d, | ||
double lon2d, double lat2d); | ||
int geohashGetDistanceIfInRadius(double x1, double y1, | ||
double x2, double y2, double radius, | ||
double *distance); | ||
int geohashGetDistanceIfInRadiusWGS84(double x1, double y1, double x2, | ||
double y2, double radius, | ||
double *distance); | ||
|
||
#endif /* GEOHASH_HELPER_HPP_ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
geodist需要是kCmdFlagsWrite吗,write命令是改变库状态的命令,会通过binlog同步到所有的从。
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@CatKang 已修改,
GEODIST
需要kCmdFlagsRead
.