LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor(store/v2): join batch.Close error with original err (#22005)

Browse Source
This commit is contained in:
beep 2024-10-02 03:00:16 +08:00 committed by GitHub
parent 7be56e213c
commit 3a69bb67b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
store/v2/commitment/metadata.go
View File

@ -82,10 +82,7 @@ func (m *MetadataStore) flushCommitInfo(version uint64, cInfo *proof.CommitInfo)
batch := m.kv.NewBatch()
defer func() {
cErr := batch.Close()
if err == nil {
err = cErr
}
err = errors.Join(err, batch.Close())
}()
cInfoKey := []byte(fmt.Sprintf(commitInfoKeyFmt, version))
value, err := cInfo.Marshal()
@ -114,10 +111,7 @@ func (m *MetadataStore) flushCommitInfo(version uint64, cInfo *proof.CommitInfo)
func (m *MetadataStore) flushRemovedStoreKeys(version uint64, storeKeys []string) (err error) {
batch := m.kv.NewBatch()
defer func() {
cErr := batch.Close()
if err == nil {
err = cErr
}
err = errors.Join(err, batch.Close())
}()
for _, storeKey := range storeKeys {

5
store/v2/migration/manager.go
View File

@ -185,10 +185,7 @@ func (m *Manager) writeChangeset() error {
// yet not in the for-loop which can leave resource lingering.
err = func() (err error) {
defer func() {
cErr := batch.Close()
if err == nil {
err = cErr
}
err = errors.Join(err, batch.Close())
}()
if err := batch.Set(csKey, csBytes); err != nil {

15
store/v2/storage/pebbledb/db.go
View File

@ -212,10 +212,7 @@ func (db *Database) Prune(version uint64) (err error) {
batch := db.storage.NewBatch()
defer func() {
cErr := batch.Close()
if err == nil {
err = cErr
}
err = errors.Join(err, batch.Close())
}()
var (
@ -339,10 +336,7 @@ func (db *Database) ReverseIterator(storeKey []byte, version uint64, start, end
func (db *Database) PruneStoreKeys(storeKeys []string, version uint64) (err error) {
batch := db.storage.NewBatch()
defer func() {
cErr := batch.Close()
if err == nil {
err = cErr
}
err = errors.Join(err, batch.Close())
}()
for _, storeKey := range storeKeys {
@ -444,10 +438,7 @@ func getMVCCSlice(db *pebble.DB, storeKey, key []byte, version uint64) ([]byte,
func (db *Database) deleteRemovedStoreKeys(version uint64) (err error) {
batch := db.storage.NewBatch()
defer func() {
cErr := batch.Close()
if err == nil {
err = cErr
}
err = errors.Join(err, batch.Close())
}()
end := encoding.BuildPrefixWithVersion(removedStoreKeyPrefix, version+1)