Skip to content
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

Jump to bottom

sstable: fix sstable.Writer key order checks for nil keys #1135

Merged
merged 1 commit into from
May 11, 2021
Merged

sstable: fix sstable.Writer key order checks for nil keys #1135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions flush_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,17 @@ func TestFlushDelRangeEmptyKey(t *testing.T) {
require.NoError(t, d.Flush())
require.NoError(t, d.Close())
}

// TestFlushEmptyKey tests that flushing an empty key does not trigger that key
// order invariant assertions.
func TestFlushEmptyKey(t *testing.T) {
d, err := Open("", &Options{FS: vfs.NewMem()})
require.NoError(t, err)
require.NoError(t, d.Set(nil, []byte("hello"), nil))
require.NoError(t, d.Flush())
val, closer, err := d.Get(nil)
require.NoError(t, err)
require.Equal(t, val, []byte("hello"))
require.NoError(t, closer.Close())
require.NoError(t, d.Close())
}
2 changes: 1 addition & 1 deletion internal/base/internal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ func (k InternalKey) Valid() bool {

// Clone clones the storage for the UserKey component of the key.
func (k InternalKey) Clone() InternalKey {
if k.UserKey == nil {
if len(k.UserKey) == 0 {
return k
}
return InternalKey{
Expand Down
12 changes: 8 additions & 4 deletions sstable/writer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func (w *Writer) Add(key InternalKey, value []byte) error {
}

func (w *Writer) addPoint(key InternalKey, value []byte) error {
if !w.disableKeyOrderChecks {
if !w.disableKeyOrderChecks && w.meta.LargestPoint.UserKey != nil {
// TODO(peter): Manually inlined version of base.InternalCompare(). This is
// 3.5% faster on BenchmarkWriter on go1.13. Remove if go1.14 or future
// versions show this to not be a performance win.
Expand All @@ -246,12 +246,16 @@ func (w *Writer) addPoint(key InternalKey, value []byte) error {
w.block.add(key, value)

w.meta.updateSeqNum(key.SeqNum())
if w.props.NumEntries == 0 {
w.meta.SmallestPoint = key.Clone()
}
// block.curKey contains the most recently added key to the block.
w.meta.LargestPoint.UserKey = w.block.curKey[:len(w.block.curKey)-8]
w.meta.LargestPoint.Trailer = key.Trailer
if w.meta.SmallestPoint.UserKey == nil {
// NB: we clone w.meta.LargestPoint rather than "key", even though they are
// semantically identical, because we need to ensure that SmallestPoint.UserKey
// is not nil. This is required by WriterMetadata.Smallest in order to
// distinguish between an unset SmallestPoint and a zero-length one.
w.meta.SmallestPoint = w.meta.LargestPoint.Clone()
}

w.props.NumEntries++
switch key.Kind() {
Expand Down