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

refactor(update) more clear dir checking

Browse Source
This commit is contained in:
Xiang Li 2013-12-05 17:16:44 -05:00
parent 40d297be66
commit 4ba7d85d56
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
store/store.go
View File

@ -366,9 +366,8 @@ func (s *store) Update(nodePath string, newValue string, expireTime time.Time) (
e := newEvent(Update, nodePath, nextIndex, n.CreatedIndex) e := newEvent(Update, nodePath, nextIndex, n.CreatedIndex)
eNode := e.Node eNode := e.Node
if len(newValue) != 0 { if n.IsDir() && len(newValue) != 0 {
if n.IsDir() { // if the node is a directory, we cannot update value to non-empty
// if the node is a directory, we cannot update value
s.Stats.Inc(UpdateFail) s.Stats.Inc(UpdateFail)
return nil, etcdErr.NewError(etcdErr.EcodeNotFile, nodePath, currIndex) return nil, etcdErr.NewError(etcdErr.EcodeNotFile, nodePath, currIndex)
} }
@ -377,12 +376,6 @@ func (s *store) Update(nodePath string, newValue string, expireTime time.Time) (
n.Write(newValue, nextIndex) n.Write(newValue, nextIndex)
eNode.Value = newValue eNode.Value = newValue
} else {
// update value to empty
eNode.Value = n.Value
n.Value = ""
}
// update ttl // update ttl
n.UpdateTTL(expireTime) n.UpdateTTL(expireTime)