mirror
/
redis
mirror of https://github.com/go-redis/redis.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix build

This commit is contained in:
Vladimir Mihailenco 2020-04-19 16:40:26 +03:00
parent 558263e5eb
commit 76f0041b12
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
commands.go
View File

@ -2570,7 +2570,9 @@ func (c cmdable) GeoAdd(ctx context.Context, key string, geoLocation ...*GeoLoca
} }
// GeoRadius is a read-only GEORADIUS_RO command. // GeoRadius is a read-only GEORADIUS_RO command.
func (c cmdable) GeoRadius(ctx context.Context, key string, longitude, latitude float64, query *GeoRadiusQuery) *GeoLocationCmd { func (c cmdable) GeoRadius(
ctx context.Context, key string, longitude, latitude float64, query *GeoRadiusQuery,
) *GeoLocationCmd {
cmd := NewGeoLocationCmd(ctx, query, "georadius_ro", key, longitude, latitude) cmd := NewGeoLocationCmd(ctx, query, "georadius_ro", key, longitude, latitude)
if query.Store != "" || query.StoreDist != "" { if query.Store != "" || query.StoreDist != "" {
cmd.SetErr(errors.New("GeoRadius does not support Store or StoreDist")) cmd.SetErr(errors.New("GeoRadius does not support Store or StoreDist"))
@ -2581,7 +2583,9 @@ func (c cmdable) GeoRadius(ctx context.Context, key string, longitude, latitude
} }
// GeoRadiusStore is a writing GEORADIUS command. // GeoRadiusStore is a writing GEORADIUS command.
func (c cmdable) GeoRadiusStore(ctx context.Context, key string, longitude, latitude float64, query *GeoRadiusQuery) *IntCmd { func (c cmdable) GeoRadiusStore(
ctx context.Context, key string, longitude, latitude float64, query *GeoRadiusQuery,
) *IntCmd {
args := geoLocationArgs(query, "georadius", key, longitude, latitude) args := geoLocationArgs(query, "georadius", key, longitude, latitude)
cmd := NewIntCmd(ctx, args...) cmd := NewIntCmd(ctx, args...)
if query.Store == "" && query.StoreDist == "" { if query.Store == "" && query.StoreDist == "" {
@ -2593,7 +2597,9 @@ func (c cmdable) GeoRadiusStore(ctx context.Context, key string, longitude, lati
} }
// GeoRadius is a read-only GEORADIUSBYMEMBER_RO command. // GeoRadius is a read-only GEORADIUSBYMEMBER_RO command.
func (c cmdable) GeoRadiusByMember(ctx context.Context, key, member string, query *GeoRadiusQuery) *GeoLocationCmd { func (c cmdable) GeoRadiusByMember(
ctx context.Context, key, member string, query *GeoRadiusQuery,
) *GeoLocationCmd {
cmd := NewGeoLocationCmd(ctx, query, "georadiusbymember_ro", key, member) cmd := NewGeoLocationCmd(ctx, query, "georadiusbymember_ro", key, member)
if query.Store != "" || query.StoreDist != "" { if query.Store != "" || query.StoreDist != "" {
cmd.SetErr(errors.New("GeoRadiusByMember does not support Store or StoreDist")) cmd.SetErr(errors.New("GeoRadiusByMember does not support Store or StoreDist"))
@ -2604,7 +2610,9 @@ func (c cmdable) GeoRadiusByMember(ctx context.Context, key, member string, quer
} }
// GeoRadiusByMemberStore is a writing GEORADIUSBYMEMBER command. // GeoRadiusByMemberStore is a writing GEORADIUSBYMEMBER command.
func (c cmdable) GeoRadiusByMemberStore(ctx context.Context, key, member string, query *GeoRadiusQuery) *IntCmd { func (c cmdable) GeoRadiusByMemberStore(
ctx context.Context, key, member string, query *GeoRadiusQuery,
) *IntCmd {
args := geoLocationArgs(query, "georadiusbymember", key, member) args := geoLocationArgs(query, "georadiusbymember", key, member)
cmd := NewIntCmd(ctx, args...) cmd := NewIntCmd(ctx, args...)
if query.Store == "" && query.StoreDist == "" { if query.Store == "" && query.StoreDist == "" {
@ -2615,7 +2623,9 @@ func (c cmdable) GeoRadiusByMemberStore(ctx context.Context, key, member string,
return cmd return cmd
} }
func (c cmdable) GeoDist(ctx context.Context, key string, member1, member2, unit string) *FloatCmd { func (c cmdable) GeoDist(
ctx context.Context, key string, member1, member2, unit string,
) *FloatCmd {
if unit == "" { if unit == "" {
unit = "km" unit = "km"
} }

4
ring.go
View File

@ -101,7 +101,7 @@ func (opt *RingOptions) init() {
} }
} }
func (opt *RingOptions) clientOptions(shard string) *Options { func (opt *RingOptions) clientOptions() *Options {
return &Options{ return &Options{
OnConnect: opt.OnConnect, OnConnect: opt.OnConnect,
@ -378,7 +378,7 @@ func NewRing(opt *RingOptions) *Ring {
} }
func newRingShard(opt *RingOptions, name, addr string) *Client { func newRingShard(opt *RingOptions, name, addr string) *Client {
clopt := opt.clientOptions(name) clopt := opt.clientOptions()
clopt.Addr = addr clopt.Addr = addr
if opt.NewClient != nil { if opt.NewClient != nil {