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

storage: fix small issues

Browse Source
This commit is contained in:
Xiang Li 2015-06-29 22:02:21 -07:00
parent 718cb18ca2
commit f8b947a00b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/kvstore.go
View File

@ -44,6 +44,10 @@ type store struct {
stopc chan struct{} stopc chan struct{}
} }
func New(path string) KV {
return newStore(path)
}
func newStore(path string) *store { func newStore(path string) *store {
s := &store{ s := &store{
b: backend.New(path, batchInterval, batchLimit), b: backend.New(path, batchInterval, batchLimit),
@ -285,7 +289,7 @@ func (s *store) rangeKeys(key, end []byte, limit, rangeRev int64) (kvs []storage
log.Fatalf("storage: cannot unmarshal event: %v", err) log.Fatalf("storage: cannot unmarshal event: %v", err)
} }
if e.Type == storagepb.PUT { if e.Type == storagepb.PUT {
kvs = append(kvs, e.Kv) kvs = append(kvs, *e.Kv)
} }
if limit > 0 && len(kvs) >= int(limit) { if limit > 0 && len(kvs) >= int(limit) {
break break
@ -309,7 +313,7 @@ func (s *store) put(key, value []byte, rev int64) {
ver = ver + 1 ver = ver + 1
event := storagepb.Event{ event := storagepb.Event{
Type: storagepb.PUT, Type: storagepb.PUT,
Kv: storagepb.KeyValue{ Kv: &storagepb.KeyValue{
Key: key, Key: key,
Value: value, Value: value,
CreateIndex: c, CreateIndex: c,
@ -388,7 +392,7 @@ func (s *store) delete(key []byte, mainrev int64) bool {
event := storagepb.Event{ event := storagepb.Event{
Type: storagepb.DELETE, Type: storagepb.DELETE,
Kv: storagepb.KeyValue{ Kv: &storagepb.KeyValue{
Key: key, Key: key,
}, },
} }