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

add RawGet that will return Response struct

Browse Source
This commit is contained in:
Xiang Li 2013-08-02 20:17:37 -07:00
parent 4a5abf1ab8
commit 7ea4ae8693
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
store/store.go
View File

@ -290,7 +290,20 @@ func (s *Store) internalGet(key string) *Response {
// If key is a file return the file
// If key is a directory reuturn an array of files
func (s *Store) Get(key string) ([]byte, error) {
resps, err := s.RawGet(key)
if err != nil {
return nil, err
}
if len(resps) == 1 {
return json.Marshal(resps[0])
}
return json.Marshal(resps)
}
func (s *Store) RawGet(key string) ([]*Response, error) {
//Update stats
s.BasicStats.Gets++
@ -299,7 +312,7 @@ func (s *Store) Get(key string) ([]byte, error) {
nodes, keys, dirs, ok := s.Tree.list(key)
if ok {
resps := make([]Response, len(nodes))
resps := make([]*Response, len(nodes))
for i := 0; i < len(nodes); i++ {
var TTL int64
@ -307,7 +320,7 @@ func (s *Store) Get(key string) ([]byte, error) {
isExpire = !nodes[i].ExpireTime.Equal(PERMANENT)
resps[i] = Response{
resps[i] = &Response{
Action: "GET",
Index: s.Index,
Key: path.Join(key, keys[i]),
@ -327,10 +340,8 @@ func (s *Store) Get(key string) ([]byte, error) {
}
}
if len(resps) == 1 {
return json.Marshal(resps[0])
}
return json.Marshal(resps)
return resps, nil
}
err := NotFoundError(key)