distributed/talent-plan-tinykv
1
0
Fork 0
mirror of https://github.com/talent-plan/tinykv.git synced 2024-12-27 13:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address issues with KeyError and MemStorage (#144)

Browse Source 
* Implement `error` for `KeyError`

closes #134

Signed-off-by: Nick Cameron <nrc@ncameron.org>

* Check for unclosed iterators in memStorage

cc #110

Signed-off-by: Nick Cameron <nrc@ncameron.org>
This commit is contained in:
Nick Cameron 2020-04-01 18:44:24 +13:00 committed by Connor
parent 612724328b
commit 9dc51167e8
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kv/storage/mem_storage.go
View File

@ -35,7 +35,7 @@ func (s *MemStorage) Stop() error {
} }
func (s *MemStorage) Reader(ctx *kvrpcpb.Context) (StorageReader, error) { func (s *MemStorage) Reader(ctx *kvrpcpb.Context) (StorageReader, error) {
return &memReader{s}, nil return &memReader{s, 0}, nil
} }
func (s *MemStorage) Write(ctx *kvrpcpb.Context, batch []Modify) error { func (s *MemStorage) Write(ctx *kvrpcpb.Context, batch []Modify) error {
@ -131,7 +131,8 @@ func (s *MemStorage) Len(cf string) int {
// memReader is a StorageReader which reads from a MemStorage. // memReader is a StorageReader which reads from a MemStorage.
type memReader struct { type memReader struct {
inner *MemStorage inner *MemStorage
iterCount int
} }
func (mr *memReader) GetCF(cf string, key []byte) ([]byte, error) { func (mr *memReader) GetCF(cf string, key []byte) ([]byte, error) {
@ -168,18 +169,24 @@ func (mr *memReader) IterCF(cf string) engine_util.DBIterator {
return nil return nil
} }
mr.iterCount += 1
min := data.Min() min := data.Min()
if min == nil { if min == nil {
return &memIter{data, memItem{}} return &memIter{data, memItem{}, mr}
} }
return &memIter{data, min.(memItem)} return &memIter{data, min.(memItem), mr}
} }
func (r *memReader) Close() {} func (r *memReader) Close() {
if r.iterCount > 0 {
panic("Unclosed iterator")
}
}
type memIter struct { type memIter struct {
data *llrb.LLRB data *llrb.LLRB
item memItem item memItem
reader *memReader
} }
func (it *memIter) Item() engine_util.DBItem { func (it *memIter) Item() engine_util.DBItem {
@ -212,7 +219,9 @@ func (it *memIter) Seek(key []byte) {
}) })
} }
func (it *memIter) Close() {} func (it *memIter) Close() {
it.reader.iterCount -= 1
}
type memItem struct { type memItem struct {
key []byte key []byte