Extract uncurried functions from storage writes #6803
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #6803 +/- ##
==========================================
- Coverage 40.96% 40.96% -0.01%
==========================================
Files 2093 2096 +3
Lines 184478 184516 +38
==========================================
+ Hits 75577 75590 +13
- Misses 102579 102608 +29
+ Partials 6322 6318 -4
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
zhangchiqing
force-pushed
the
leo/db-ops-writes
branch
from
0516981 to
8fa3022
Compare
zhangchiqing
requested review from
janezpodhostnik,
jordanschalm and
peterargue
| // Using these deprecated functions could minimize the changes during refactor and easier to review the changes. | ||
| // The simplified implementation of the functions are in the writes.go file, which are encouraged to be used instead. | ||
|
|
||
| func Upsert(key []byte, val interface{}) func(storage.Writer) error { |
There was a problem hiding this comment.
Originally these functions are implemented as curried functions in order to follow the same pattern as badger transaction.
However, since we are moving away from badger transaction, it's simpler just removing this additional wrap by using the uncurried functions.
I extracted the uncurried functions and kept the original functions here so that the same logic are reused, as well as the tests.
Useful for refactoring storage modules with UpsertKey instead of Upsert for instance.
utils/merr/closer.go
Outdated
| func CloseAndMergeError(closable io.Closer, err error) error { | ||
| var merr *multierror.Error | ||
| if err != nil { | ||
| merr = multierror.Append(merr, err) | ||
| } | ||
|
|
||
| closeError := closable.Close() | ||
| if closeError != nil { | ||
| merr = multierror.Append(merr, closeError) | ||
| } | ||
|
|
||
| return merr.ErrorOrNil() | ||
| } |
There was a problem hiding this comment.
| func CloseAndMergeError(closable io.Closer, err error) error { | |
| var merr *multierror.Error | |
| if err != nil { | |
| merr = multierror.Append(merr, err) | |
| } | |
| closeError := closable.Close() | |
| if closeError != nil { | |
| merr = multierror.Append(merr, closeError) | |
| } | |
| return merr.ErrorOrNil() | |
| } | |
| func CloseAndMergeError(closable io.Closer, original error) error { | |
| merr = multierror.Append(merr, closable.Close()) | |
| return merr.ErrorOrNil() | |
| } |
I'm not 100% but I think this will just work
There was a problem hiding this comment.
refactored and added test cases.
| "github.com/onflow/flow-go/model/flow" | ||
| ) | ||
|
|
||
| const ( |
There was a problem hiding this comment.
where did these constants come from? Is this a unrelated thing?
There was a problem hiding this comment.
They are copied from https://github.com/onflow/flow-go/blob/master/storage/badger/operation/prefix.go
zhangchiqing
force-pushed
the
leo/db-ops-writes
branch
from
8fa3022 to
a0068e1
Compare
This PR: