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

update operation

Browse Source
This commit is contained in:
Xiang Li 2013-09-06 23:01:11 -04:00
parent d95485d511
commit 907e39edec
2 changed files with 72 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/etcd-file-system.md
View File

@ -30,13 +30,20 @@ Besides the file and directory difference, all nodes have common attributes and
- If the node is a directory, the child nodes of the directory will be returned.
- If recursive is true, it will recursively get the nodes of the directory.
- **Set** (path, value[optional], ttl [optional])
- **Create** (path, value[optional], ttl [optional])
Set the value to a file. Set operation will help to create intermediate directories with no expiration time.
- If the value is given, set will create a file
- If the value is not given, set will crate a directory
Create a file. Create operation will help to create intermediate directories with no expiration time.
- If the file already exists, create will fail.
- If the value is given, set will create a file.
- If the value is not given, set will crate a directory.
- If ttl is given, the node will be deleted when it expires.
- **Update** (path, value[optional], ttl [optional])
Update the content of the node.
- If the value is given, the value of the key will be updated.
- If ttl is given, the expiration time of the node will be updated.
- **Delete** (path, recursive)
Delete the node of given path.

101
file_system/file_system.go
View File

@ -65,15 +65,69 @@ func (fs *FileSystem) Get(keyPath string, recusive bool, index uint64, term uint
return e, nil
}
func (fs *FileSystem) Set(keyPath string, value string, expireTime time.Time, index uint64, term uint64) (*Event, error) {
func (fs *FileSystem) Update(keyPath string, value string, expireTime time.Time, index uint64, term uint64) (*Event, error) {
n, err := fs.InternalGet(keyPath, index, term)
if err != nil { // if node does not exist, return error
return nil, err
}
e := newEvent(Set, keyPath, fs.Index, fs.Term)
if n.IsDir() { // if the node is a directory, we can only update ttl
if len(value) != 0 {
return nil, etcdErr.NewError(102, keyPath)
}
if n.ExpireTime != Permanent && expireTime != Permanent {
n.stopExpire <- true
}
} else { // if the node is a file, we can update value and ttl
e.PrevValue = n.Value
if len(value) != 0 {
e.Value = value
}
n.Write(value, index, term)
if n.ExpireTime != Permanent && expireTime != Permanent {
n.stopExpire <- true
}
}
// update ttl
if expireTime != Permanent {
go n.Expire()
e.Expiration = &n.ExpireTime
e.TTL = int64(expireTime.Sub(time.Now()) / time.Second)
}
return e, nil
}
func (fs *FileSystem) Create(keyPath string, value string, expireTime time.Time, create bool, index uint64, term uint64) (*Event, error) {
keyPath = path.Clean("/" + keyPath)
// update file system known index and term
fs.Index, fs.Term = index, term
// make sure we can create the node
_, err := fs.InternalGet(keyPath, index, term)
dir, name := path.Split(keyPath)
if err != nil { // key already exists
return nil, etcdErr.NewError(105, keyPath)
}
// walk through the keyPath and get the last directory node
etcdError, _ := err.(etcdErr.Error)
if etcdError.ErrorCode == 104 { // we cannot create the key due to meet a file while walking
return nil, err
}
dir, _ := path.Split(keyPath)
// walk through the keyPath, create dirs and get the last directory node
d, err := fs.walk(dir, fs.checkDir)
if err != nil {
@ -83,28 +137,9 @@ func (fs *FileSystem) Set(keyPath string, value string, expireTime time.Time, in
e := newEvent(Set, keyPath, fs.Index, fs.Term)
e.Value = value
f, err := d.GetFile(name)
f := newFile(keyPath, value, fs.Index, fs.Term, d, "", expireTime)
if err == nil {
if f != nil { // update previous file if exist
e.PrevValue = f.Value
f.Write(e.Value, index, term)
// if the previous ExpireTime is not Permanent and expireTime is given
// we stop the previous expire routine
if f.ExpireTime != Permanent && expireTime != Permanent {
f.stopExpire <- true
}
} else { // create new file
f = newFile(keyPath, value, fs.Index, fs.Term, d, "", expireTime)
err = d.Add(f)
}
}
err = d.Add(f)
if err != nil {
return nil, err
@ -125,20 +160,6 @@ func (fs *FileSystem) TestAndSet(keyPath string, prevValue string, prevIndex uin
if err != nil {
etcdError, _ := err.(etcdErr.Error)
if etcdError.ErrorCode == 100 { // file does not exist
if prevValue == "" && prevIndex == 0 { // test against if prevValue is empty
fs.Set(keyPath, value, expireTime, index, term)
e := newEvent(TestAndSet, keyPath, index, term)
e.Value = value
return e, nil
}
return nil, err
}
return nil, err
}