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

server: p.Get -> p.QuorumGet

Browse Source
This commit is contained in:
Yicheng Qin 2014-08-04 11:10:24 -07:00
parent cd4b35c841
commit a191df10a3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcd/v2_apply.go
View File

@ -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)

2
etcd/v2_http_get.go
View File

@ -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
}

4
etcd/v2_store.go
View File

@ -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)
}