Skip to content

Fix cornercase in capping memory allowance #3008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+5 −5
Open

Fix cornercase in capping memory allowance #3008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63f51fa
Fix cornercase in capping memory allowance
rjl493456442 Oct 23, 2023
b2fd753
Fix size overflow in batch
rjl493456442 Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion batch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,7 +1381,7 @@ func (b *Batch) countData() []byte {

func (b *Batch) grow(n int) {
newSize := len(b.data) + n
if uint64(newSize) >= maxBatchSize {
if uint64(newSize) > maxBatchSize {
panic(ErrBatchTooLarge)
}
if newSize > cap(b.data) {
Expand Down
2 changes: 1 addition & 1 deletion batch_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,7 +986,7 @@ func TestBatchTooLarge(t *testing.T) {
result = r
}
}()
b.grow(maxBatchSize)
b.grow(maxBatchSize + 1)
}()
require.EqualValues(t, ErrBatchTooLarge, result)
}
Expand Down
4 changes: 2 additions & 2 deletions options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1662,8 +1662,8 @@ func (o *Options) Validate() error {
fmt.Fprintf(&buf, "L0StopWritesThreshold (%d) must be >= L0CompactionThreshold (%d)\n",
o.L0StopWritesThreshold, o.L0CompactionThreshold)
}
if uint64(o.MemTableSize) >= maxMemTableSize {
fmt.Fprintf(&buf, "MemTableSize (%s) must be < %s\n",
if uint64(o.MemTableSize) > maxMemTableSize {
fmt.Fprintf(&buf, "MemTableSize (%s) must be <= %s\n",
humanize.Bytes.Uint64(uint64(o.MemTableSize)), humanize.Bytes.Uint64(maxMemTableSize))
}
if o.MemTableStopWritesThreshold < 2 {
Expand Down
2 changes: 1 addition & 1 deletion options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func TestOptionsValidate(t *testing.T) {
[Options]
mem_table_size=4294967296
`,
`MemTableSize \(4\.0GB\) must be < [2|4]\.0GB`,
`MemTableSize \(4\.0GB\) must be <= [2|4]\.0GB`,
},
{`
[Options]
Expand Down