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

client: add Update method

Browse Source
This commit is contained in:
Brian Waldon 2015-01-21 15:10:26 -08:00 committed by Yicheng Qin
parent c6d955f4c1
commit 4e5c015fe9
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
client/keys.go
View File

@ -62,6 +62,8 @@ func NewDiscoveryKeysAPI(c HTTPClient) KeysAPI {
type KeysAPI interface {
Create(ctx context.Context, key, value string) (*Response, error)
Update(ctx context.Context, key, value string) (*Response, error)
Get(ctx context.Context, key string) (*Response, error)
Watch(key string, idx uint64) Watcher
@ -119,6 +121,24 @@ func (k *httpKeysAPI) Create(ctx context.Context, key, val string) (*Response, e
return unmarshalHTTPResponse(resp.StatusCode, resp.Header, body)
}
func (k *httpKeysAPI) Update(ctx context.Context, key, val string) (*Response, error) {
act := &setAction{
Prefix: k.prefix,
Key: key,
Value: val,
Options: SetOptions{
PrevExist: PrevExist,
},
}
resp, body, err := k.client.Do(ctx, act)
if err != nil {
return nil, err
}
return unmarshalHTTPResponse(resp.StatusCode, resp.Header, body)
}
func (k *httpKeysAPI) Get(ctx context.Context, key string) (*Response, error) {
get := &getAction{
Prefix: k.prefix,

16
discovery/discovery_test.go
View File

@ -27,6 +27,7 @@ import (
"github.com/coreos/etcd/Godeps/_workspace/src/github.com/jonboulle/clockwork"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
"github.com/coreos/etcd/client"
)
@ -262,7 +263,7 @@ func TestWaitNodes(t *testing.T) {
for i, tt := range tests {
// Basic case
c := &clientWithResp{nil, &watcherWithResp{tt.rs}}
c := &clientWithResp{rs: nil, w: &watcherWithResp{rs: tt.rs}}
dBase := &discovery{cluster: "1000", c: c}
// Retry case
@ -312,12 +313,12 @@ func TestWaitNodes(t *testing.T) {
func TestCreateSelf(t *testing.T) {
rs := []*client.Response{{Node: &client.Node{Key: "1000/1", CreatedIndex: 2}}}
w := &watcherWithResp{rs}
errw := &watcherWithErr{errors.New("watch err")}
w := &watcherWithResp{rs: rs}
errw := &watcherWithErr{err: errors.New("watch err")}
c := &clientWithResp{rs, w}
errc := &clientWithErr{errors.New("create err"), w}
errwc := &clientWithResp{rs, errw}
c := &clientWithResp{rs: rs, w: w}
errc := &clientWithErr{err: errors.New("create err"), w: w}
errwc := &clientWithResp{rs: rs, w: errw}
tests := []struct {
c client.KeysAPI
@ -409,6 +410,7 @@ func TestRetryFailure(t *testing.T) {
type clientWithResp struct {
rs []*client.Response
w client.Watcher
client.KeysAPI
}
func (c *clientWithResp) Create(ctx context.Context, key string, value string) (*client.Response, error) {
@ -440,6 +442,7 @@ func (c *clientWithResp) RecursiveWatch(key string, waitIndex uint64) client.Wat
type clientWithErr struct {
err error
w client.Watcher
client.KeysAPI
}
func (c *clientWithErr) Create(ctx context.Context, key string, value string) (*client.Response, error) {
@ -459,6 +462,7 @@ func (c *clientWithErr) RecursiveWatch(key string, waitIndex uint64) client.Watc
}
type watcherWithResp struct {
client.KeysAPI
rs []*client.Response
}