commit
4a617979a9
|
@ -325,19 +325,7 @@ func (s *Store) Get(key string) ([]byte, error) {
|
|||
return json.Marshal(resps)
|
||||
}
|
||||
|
||||
func (s *Store) RawGet(key string) ([]*Response, error) {
|
||||
// Update stats
|
||||
s.BasicStats.Gets++
|
||||
|
||||
key = path.Clean("/" + key)
|
||||
|
||||
nodes, keys, ok := s.Tree.list(key)
|
||||
|
||||
if ok {
|
||||
|
||||
node, ok := nodes.(*Node)
|
||||
|
||||
if ok {
|
||||
func (s *Store) rawGetNode(key string, node *Node) ([]*Response, error) {
|
||||
resps := make([]*Response, 1)
|
||||
|
||||
isExpire := !node.ExpireTime.Equal(PERMANENT)
|
||||
|
@ -357,13 +345,13 @@ func (s *Store) RawGet(key string) ([]*Response, error) {
|
|||
}
|
||||
|
||||
return resps, nil
|
||||
}
|
||||
|
||||
nodes, _ := nodes.([]*Node)
|
||||
}
|
||||
|
||||
func (s *Store) rawGetNodeList(key string, keys []string, nodes []*Node) ([]*Response, error) {
|
||||
resps := make([]*Response, len(nodes))
|
||||
for i := 0; i < len(nodes); i++ {
|
||||
|
||||
// TODO: check if nodes and keys are the same length
|
||||
for i := 0; i < len(nodes); i++ {
|
||||
var TTL int64
|
||||
var isExpire bool = false
|
||||
|
||||
|
@ -391,9 +379,27 @@ func (s *Store) RawGet(key string) ([]*Response, error) {
|
|||
}
|
||||
|
||||
return resps, nil
|
||||
}
|
||||
|
||||
func (s *Store) RawGet(key string) ([]*Response, error) {
|
||||
// Update stats
|
||||
s.BasicStats.Gets++
|
||||
|
||||
key = path.Clean("/" + key)
|
||||
|
||||
nodes, keys, ok := s.Tree.list(key)
|
||||
if !ok {
|
||||
return nil, etcdErr.NewError(100, "get: "+key)
|
||||
}
|
||||
|
||||
return nil, etcdErr.NewError(100, "get: "+key)
|
||||
switch node := nodes.(type) {
|
||||
case *Node:
|
||||
return s.rawGetNode(key, node)
|
||||
case []*Node:
|
||||
return s.rawGetNodeList(key, keys, node)
|
||||
default:
|
||||
panic("invalid cast ")
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Store) Delete(key string, index uint64) ([]byte, error) {
|
||||
|
@ -415,7 +421,9 @@ func (s *Store) internalDelete(key string, index uint64) ([]byte, error) {
|
|||
|
||||
node, ok := s.Tree.get(key)
|
||||
|
||||
if ok {
|
||||
if !ok {
|
||||
return nil, etcdErr.NewError(100, "delete: "+key)
|
||||
}
|
||||
|
||||
resp := Response{
|
||||
Action: "DELETE",
|
||||
|
@ -448,10 +456,6 @@ func (s *Store) internalDelete(key string, index uint64) ([]byte, error) {
|
|||
s.addToResponseMap(index, &resp)
|
||||
|
||||
return msg, err
|
||||
|
||||
} else {
|
||||
return nil, etcdErr.NewError(100, "delete: "+key)
|
||||
}
|
||||
}
|
||||
|
||||
// Set the value of the key to the value if the given prevValue is equal to the value of the key
|
||||
|
@ -465,12 +469,16 @@ func (s *Store) TestAndSet(key string, prevValue string, value string, expireTim
|
|||
resp := s.internalGet(key)
|
||||
|
||||
if resp == nil {
|
||||
return nil, etcdErr.NewError(100, "testandset: "+key)
|
||||
if prevValue != "" {
|
||||
errmsg := fmt.Sprintf("TestAndSet: key not found and previousValue is not empty %s:%s ", key, prevValue)
|
||||
return nil, etcdErr.NewError(100, errmsg)
|
||||
}
|
||||
return s.internalSet(key, value, expireTime, index)
|
||||
}
|
||||
|
||||
if resp.Value == prevValue {
|
||||
|
||||
// If test success, do set
|
||||
// If test succeed, do set
|
||||
return s.internalSet(key, value, expireTime, index)
|
||||
} else {
|
||||
|
||||
|
|
Loading…
Reference in New Issue