[db] fix Size() and refactor counting index interface #4490
+167
−203
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dustinxie
requested review from
CoderZhi,
Liuhaai and
envestcc
as code owners
dustinxie
force-pushed
the
fixcounting
branch
3 times, most recently
from
2673dd6 to
7642dea
Compare
envestcc
reviewed
Nov 15, 2024
db/counting_index.go
Outdated
| @@ -31,8 +31,14 @@ type ( | |||
| CountingIndex interface { | |||
| // Size returns the total number of keys so far | |||
| Size() uint64 | |||
| // Add inserts a value into the index | |||
| Add([]byte, bool) error | |||
| // AddOne inserts one entry into the index | |||
There was a problem hiding this comment.
suggest following interface, it seems more clear:
CountingIndex interface{
Size() uint64
Add([]byte, bool) error
Get(uint64) ([]byte, error)
Range(uint64, uint64) ([][]byte, error)
Revert(uint64) error
Close()
// batch support
BatchAdd(batch, []byte) error
Commit(batch) error
}
CoderZhi
reviewed
Nov 15, 2024
db/counting_index.go
Outdated
| if inBatch { | ||
| return c.addBatch(value) | ||
| func (c *countingIndex) AddOne(value []byte) error { | ||
| if err := c.TurnOn(); err != nil { |
There was a problem hiding this comment.
the definition of TurnOn is the service is ready, which doesn't match the usage here.
db/counting_index.go
Outdated
Comment on lines
35
to
39
| AddOne([]byte) error | ||
| // AddMultiple inserts multiple entries into the index | ||
| AddMultiple([][]byte) error | ||
| // AddToExternalBatch inserts entries into external batch | ||
| AddToExternalBatch(batch.KVStoreBatch, [][]byte) error |
There was a problem hiding this comment.
do we really need to distinguish internal and external?
dustinxie
force-pushed
the
fixcounting
branch
from
7642dea to
ab54fc2
Compare
dustinxie
force-pushed
the
fixcounting
branch
from
ab54fc2 to
cd0afa7
Compare
|
envestcc
reviewed
Nov 18, 2024
| }, nil | ||
| } | ||
|
|
||
| // Size returns the total number of keys so far | ||
| func (c *countingIndex) Size() uint64 { | ||
| return atomic.LoadUint64(&c.size) | ||
| c.lock.RLock() |
There was a problem hiding this comment.
didn't see the benefits of the changes
envestcc
reviewed
Nov 18, 2024
| } | ||
|
|
||
| func (c *countingIndex) BeginBatch(b batch.KVStoreBatch) { | ||
| c.lock.Lock() |
There was a problem hiding this comment.
why lock at begin instead of end?
envestcc
reviewed
Nov 18, 2024
| // AddToBatch inserts an entry into external batch | ||
| AddToBatch(batch.KVStoreBatch, []byte) | ||
| // BeginBatch should be called before writing the batch | ||
| BeginBatch(batch.KVStoreBatch) |
There was a problem hiding this comment.
maybe can put PreCommit and PostCommit into batch intead
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
improve the counting index interface.
Fixes #4489
Type of change
Please delete options that are not relevant.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Checklist: