Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientv3: support >= Range requests

Browse Source 
Turns out grpc will convert an empty byte string to nil, so use "\0" to
indicate Range on >= key in v3 grpc protocol.
This commit is contained in:
Anthony Romano 2016-02-12 12:02:57 -08:00
parent 1d02559ae5
commit 6851fffdfb
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clientv3/kv.go
View File

@ -38,8 +38,8 @@ type KV interface {
// Get retrieves keys.
// By default, Get will return the value for "key", if any.
// When passed WithRange(end), Get will return the keys in the range [key, end) if
// end is non-empty, otherwise it returns keys greater than or equal to key.
// When passed WithRange(end), Get will return the keys in the range [key, end).
// When passed WithFromKey(), Get returns keys greater than or equal to key.
// When passed WithRev(rev) with rev > 0, Get retrieves keys at the given revision;
// if the required revision is compacted, the request will fail with ErrCompacted .
// When passed WithLimit(limit), the number of returned keys is bounded by limit.

1
clientv3/op.go
View File

@ -132,6 +132,7 @@ func WithSort(tgt SortTarget, order SortOrder) OpOption {
func WithRange(endKey string) OpOption {
return func(op *Op) { op.end = []byte(endKey) }
}
func WithFromKey() OpOption { return WithRange("\x00") }
func WithSerializable() OpOption {
return func(op *Op) { op.serializable = true }
}

6
etcdserver/v3demo_server.go
View File

@ -311,6 +311,12 @@ func applyRange(txnID int64, kv dstorage.KV, r *pb.RangeRequest) (*pb.RangeRespo
err error
)
// grpc sends empty byte strings as nils, so use a '\0' to indicate
// wanting a >= query
if len(r.RangeEnd) == 1 && r.RangeEnd[0] == 0 {
r.RangeEnd = []byte{}
}
limit := r.Limit
if r.SortOrder != pb.RangeRequest_NONE {
// fetch everything; sort and truncate afterwards

5
integration/v3_grpc_test.go
View File

@ -488,6 +488,8 @@ func TestV3RangeRequest(t *testing.T) {
{Key: []byte("c"), RangeEnd: []byte("c")},
// [d, b) = empty
{Key: []byte("d"), RangeEnd: []byte("b")},
// ["\0", "\0") => all in range
{Key: []byte{0}, RangeEnd: []byte{0}},
},
[][]string{
@ -496,8 +498,9 @@ func TestV3RangeRequest(t *testing.T) {
{},
{},
{},
{"a", "b", "c", "d", "e"},
},
[]bool{false, false, false, false, false},
[]bool{false, false, false, false, false, false},
},
// revision
{