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

store: fix recursive/dir arguments

Browse Source
This commit is contained in:
Jonathan Boulle
2014-09-22 14:40:19 -07:00
parent 34380ab096
commit e08df4c8d2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/server.go
View File

@ -269,7 +269,7 @@ func (s *EtcdServer) apply(r pb.Request) Response {
case r.PrevIndex > 0 || r.PrevValue != "": case r.PrevIndex > 0 || r.PrevValue != "":
return f(s.Store.CompareAndDelete(r.Path, r.PrevValue, r.PrevIndex)) return f(s.Store.CompareAndDelete(r.Path, r.PrevValue, r.PrevIndex))
default: default:
return f(s.Store.Delete(r.Path, r.Recursive, r.Dir)) return f(s.Store.Delete(r.Path, r.Dir, r.Recursive))
} }
case "QGET": case "QGET":
return f(s.Store.Get(r.Path, r.Recursive, r.Sorted)) return f(s.Store.Get(r.Path, r.Recursive, r.Sorted))

2
store/store.go
View File

@ -48,7 +48,7 @@ type Store interface {
expireTime time.Time) (*Event, error) expireTime time.Time) (*Event, error)
CompareAndSwap(nodePath string, prevValue string, prevIndex uint64, CompareAndSwap(nodePath string, prevValue string, prevIndex uint64,
value string, expireTime time.Time) (*Event, error) value string, expireTime time.Time) (*Event, error)
Delete(nodePath string, recursive, dir bool) (*Event, error) Delete(nodePath string, dir, recursive bool) (*Event, error)
CompareAndDelete(nodePath string, prevValue string, prevIndex uint64) (*Event, error) CompareAndDelete(nodePath string, prevValue string, prevIndex uint64) (*Event, error)
Watch(prefix string, recursive, stream bool, sinceIndex uint64) (Watcher, error) Watch(prefix string, recursive, stream bool, sinceIndex uint64) (Watcher, error)