diff --git a/etcd/v2_apply.go b/etcd/v2_apply.go index ce23da03d..4a4942014 100644 --- a/etcd/v2_apply.go +++ b/etcd/v2_apply.go @@ -49,7 +49,7 @@ func (p *participant) v2apply(index int64, ent raft.Entry) { e, err = p.Store.CompareAndDelete(cmd.Key, cmd.PrevValue, cmd.PrevIndex) case "cas": e, err = p.Store.CompareAndSwap(cmd.Key, cmd.PrevValue, cmd.PrevIndex, cmd.Value, cmd.Time) - case "get": + case "quorumGet": e, err = p.Store.Get(cmd.Key, cmd.Recursive, cmd.Sorted) case "sync": p.Store.DeleteExpiredKeys(cmd.Time) diff --git a/etcd/v2_http_get.go b/etcd/v2_http_get.go index 85446b3d2..61189beb5 100644 --- a/etcd/v2_http_get.go +++ b/etcd/v2_http_get.go @@ -127,7 +127,7 @@ func (p *participant) handleQuorumGet(key string, recursive, sort bool, w http.R if req.Method == "HEAD" { return fmt.Errorf("not support HEAD") } - event, err := p.Get(key, recursive, sort) + event, err := p.QuorumGet(key, recursive, sort) if err != nil { return err } diff --git a/etcd/v2_store.go b/etcd/v2_store.go index 3bc3392b1..59762047a 100644 --- a/etcd/v2_store.go +++ b/etcd/v2_store.go @@ -67,8 +67,8 @@ func (p *participant) CAD(key string, prevValue string, prevIndex uint64) (*stor return p.do(cad) } -func (p *participant) Get(key string, recursive, sorted bool) (*store.Event, error) { - get := &cmd{Type: "get", Key: key, Recursive: recursive, Sorted: sorted} +func (p *participant) QuorumGet(key string, recursive, sorted bool) (*store.Event, error) { + get := &cmd{Type: "quorumGet", Key: key, Recursive: recursive, Sorted: sorted} return p.do(get) }