Merge "services/groups: storage engine update follow up (v.io/c/13650)"
diff --git a/services/groups/internal/store/leveldb/store.go b/services/groups/internal/store/leveldb/store.go
index 16af2de..964883c 100644
--- a/services/groups/internal/store/leveldb/store.go
+++ b/services/groups/internal/store/leveldb/store.go
@@ -52,40 +52,40 @@
}
func (st *T) Insert(key string, value interface{}) error {
- return istore.RunInTransaction(st.db, func(db istore.StoreReadWriter) error {
- if _, err := get(db, key); verror.ErrorID(err) != store.ErrUnknownKey.ID {
+ return istore.RunInTransaction(st.db, func(tx istore.Transaction) error {
+ if _, err := get(tx, key); verror.ErrorID(err) != store.ErrUnknownKey.ID {
if err != nil {
return err
}
return verror.New(store.ErrKeyExists, nil, key)
}
- return put(db, key, &entry{Value: value})
+ return put(tx, key, &entry{Value: value})
})
}
func (st *T) Update(key string, value interface{}, version string) error {
- return istore.RunInTransaction(st.db, func(db istore.StoreReadWriter) error {
- e, err := get(db, key)
+ return istore.RunInTransaction(st.db, func(tx istore.Transaction) error {
+ e, err := get(tx, key)
if err != nil {
return err
}
if err := e.checkVersion(version); err != nil {
return err
}
- return put(db, key, &entry{Value: value, Version: e.Version + 1})
+ return put(tx, key, &entry{Value: value, Version: e.Version + 1})
})
}
func (st *T) Delete(key string, version string) error {
- return istore.RunInTransaction(st.db, func(db istore.StoreReadWriter) error {
- e, err := get(db, key)
+ return istore.RunInTransaction(st.db, func(tx istore.Transaction) error {
+ e, err := get(tx, key)
if err != nil {
return err
}
if err := e.checkVersion(version); err != nil {
return err
}
- return delete(db, key)
+ return delete(tx, key)
})
}
@@ -93,8 +93,8 @@
return convertError(st.db.Close())
}
-func get(db istore.StoreReadWriter, key string) (*entry, error) {
- bytes, _ := db.Get([]byte(key), nil)
+func get(st istore.StoreReader, key string) (*entry, error) {
+ bytes, _ := st.Get([]byte(key), nil)
if bytes == nil {
return nil, verror.New(store.ErrUnknownKey, nil, key)
}
@@ -105,19 +105,19 @@
return e, nil
}
-func put(db istore.StoreReadWriter, key string, e *entry) error {
+func put(stw istore.StoreWriter, key string, e *entry) error {
bytes, err := vom.Encode(e)
if err != nil {
return convertError(err)
}
- if err := db.Put([]byte(key), bytes); err != nil {
+ if err := stw.Put([]byte(key), bytes); err != nil {
return convertError(err)
}
return nil
}
-func delete(db istore.StoreReadWriter, key string) error {
- if err := db.Delete([]byte(key)); err != nil {
+func delete(stw istore.StoreWriter, key string) error {
+ if err := stw.Delete([]byte(key)); err != nil {
return convertError(err)
}
return nil
