mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "*: TestKVRange to clientv3/integration, fix rev"

Browse Source
This commit is contained in:
Gyu-Ho Lee
2016-01-29 18:20:56 -08:00
parent f6031b9d11
commit 57dedd8c89
2 changed files with 4 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
etcdserver/v3demo_server.go
View File

@ -285,6 +285,7 @@ func applyRange(txnID int64, kv dstorage.KV, r *pb.RangeRequest) (*pb.RangeRespo
var (
kvs []storagepb.KeyValue
rev int64
err error
)
@ -299,12 +300,12 @@ func applyRange(txnID int64, kv dstorage.KV, r *pb.RangeRequest) (*pb.RangeRespo
}
if txnID != noTxn {
kvs, _, err = kv.TxnRange(txnID, r.Key, r.RangeEnd, limit, r.Revision)
kvs, rev, err = kv.TxnRange(txnID, r.Key, r.RangeEnd, limit, r.Revision)
if err != nil {
return nil, err
}
} else {
kvs, _, err = kv.Range(r.Key, r.RangeEnd, limit, r.Revision)
kvs, rev, err = kv.Range(r.Key, r.RangeEnd, limit, r.Revision)
if err != nil {
return nil, err
}
@ -337,7 +338,7 @@ func applyRange(txnID int64, kv dstorage.KV, r *pb.RangeRequest) (*pb.RangeRespo
resp.More = true
}
resp.Header.Revision = kv.Rev()
resp.Header.Revision = rev
for i := range kvs {
resp.Kvs = append(resp.Kvs, &kvs[i])
}