refactor(store): add missing error checks in store (#17794)

This commit is contained in:
Julien Robert 2023-09-20 13:30:41 +02:00 committed by GitHub
parent 86ab9890b8
commit 22925c7d8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions

View File

@ -363,7 +363,9 @@ func (st *Store) Query(req *types.RequestQuery) (res *types.ResponseQuery, err e
for ; iterator.Valid(); iterator.Next() {
pairs.Pairs = append(pairs.Pairs, kv.Pair{Key: iterator.Key(), Value: iterator.Value()})
}
iterator.Close()
if err := iterator.Close(); err != nil {
panic(fmt.Errorf("failed to close iterator: %w", err))
}
bz, err := pairs.Marshal()
if err != nil {

View File

@ -314,7 +314,9 @@ func deleteKVStore(kv types.KVStore) error {
keys = append(keys, itr.Key())
itr.Next()
}
itr.Close()
if err := itr.Close(); err != nil {
return err
}
for _, k := range keys {
kv.Delete(k)
@ -330,7 +332,9 @@ func moveKVStoreData(oldDB, newDB types.KVStore) error {
newDB.Set(itr.Key(), itr.Value())
itr.Next()
}
itr.Close()
if err := itr.Close(); err != nil {
return err
}
// then delete the old store
return deleteKVStore(oldDB)
@ -1106,7 +1110,9 @@ func (rs *Store) GetCommitInfo(ver int64) (*types.CommitInfo, error) {
func (rs *Store) flushMetadata(db dbm.DB, version int64, cInfo *types.CommitInfo) {
rs.logger.Debug("flushing metadata", "height", version)
batch := db.NewBatch()
defer batch.Close()
defer func() {
_ = batch.Close()
}()
if cInfo != nil {
flushCommitInfo(batch, version, cInfo)

View File

@ -197,6 +197,6 @@ func writeOperation(w io.Writer, op operation, tc types.TraceContext, key, value
_, err = io.WriteString(w, "\n")
if err != nil {
panic(err)
panic(errors.Wrap(err, "failed to write newline"))
}
}