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

manifest: add methods for extending table bounds #1535

Merged
merged 1 commit into from
Feb 26, 2022
Merged

manifest: add methods for extending table bounds #1535

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
15 changes: 9 additions & 6 deletions compaction.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2233,12 +2233,15 @@ func (d *DB) runCompaction(
)
}

meta.SmallestPointKey = writerMeta.SmallestPointKey(d.cmp)
meta.LargestPointKey = writerMeta.LargestPointKey(d.cmp)
meta.SmallestRangeKey = writerMeta.SmallestRangeKey
meta.LargestRangeKey = writerMeta.LargestRangeKey
meta.Smallest = writerMeta.Smallest(d.cmp)
meta.Largest = writerMeta.Largest(d.cmp)
if writerMeta.HasPointKeys {
meta.ExtendPointKeyBounds(d.cmp, writerMeta.SmallestPoint, writerMeta.LargestPoint)
}
if writerMeta.HasRangeDelKeys {
meta.ExtendPointKeyBounds(d.cmp, writerMeta.SmallestRangeDel, writerMeta.LargestRangeDel)
}
if writerMeta.HasRangeKeys {
meta.ExtendRangeKeyBounds(d.cmp, writerMeta.SmallestRangeKey, writerMeta.LargestRangeKey)
}

// Verify that the sstable bounds fall within the compaction input
// bounds. This is a sanity check that we don't have a logic error
Expand Down
97 changes: 56 additions & 41 deletions compaction_picker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,11 @@ func loadVersion(d *datadriven.TestData) (*version, *Options, [numLevels]int64,
} else {
key = base.MakeInternalKey([]byte(fmt.Sprintf("%04d", i)), i, InternalKeyKindSet)
}
m := &fileMetadata{
Smallest: key,
Largest: key,
m := (&fileMetadata{
SmallestSeqNum: key.SeqNum(),
LargestSeqNum: key.SeqNum(),
Size: 1,
}
}).ExtendPointKeyBounds(opts.Comparer.Compare, key, key)
if size >= 100 {
// If the requested size of the level is very large only add a single
// file in order to avoid massive blow-up in the number of files in
Expand Down Expand Up @@ -366,8 +364,11 @@ func TestCompactionPickerIntraL0(t *testing.T) {
if len(parts) != 2 {
t.Fatalf("malformed table spec: %s", s)
}
m.Smallest = base.ParseInternalKey(strings.TrimSpace(parts[0]))
m.Largest = base.ParseInternalKey(strings.TrimSpace(parts[1]))
m.ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(strings.TrimSpace(parts[0])),
base.ParseInternalKey(strings.TrimSpace(parts[1])),
)
m.SmallestSeqNum = m.Smallest.SeqNum()
m.LargestSeqNum = m.Largest.SeqNum()
if m.SmallestSeqNum > m.LargestSeqNum {
Expand Down Expand Up @@ -437,6 +438,9 @@ func TestCompactionPickerIntraL0(t *testing.T) {
}

func TestCompactionPickerL0(t *testing.T) {
opts := (*Options)(nil).EnsureDefaults()
opts.Experimental.L0CompactionConcurrency = 1

parseMeta := func(s string) (*fileMetadata, error) {
parts := strings.Split(s, ":")
fileNum, err := strconv.Atoi(parts[0])
Expand All @@ -448,18 +452,18 @@ func TestCompactionPickerL0(t *testing.T) {
if len(parts) != 2 {
return nil, errors.Errorf("malformed table spec: %s", s)
}
m := &fileMetadata{
FileNum: base.FileNum(fileNum),
Smallest: base.ParseInternalKey(strings.TrimSpace(parts[0])),
Largest: base.ParseInternalKey(strings.TrimSpace(parts[1])),
}
m := (&fileMetadata{
FileNum: base.FileNum(fileNum),
}).ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(strings.TrimSpace(parts[0])),
base.ParseInternalKey(strings.TrimSpace(parts[1])),
)
m.SmallestSeqNum = m.Smallest.SeqNum()
m.LargestSeqNum = m.Largest.SeqNum()
return m, nil
}

opts := (*Options)(nil).EnsureDefaults()
opts.Experimental.L0CompactionConcurrency = 1
var picker *compactionPickerByScore
var inProgressCompactions []compactionInfo
var pc *pickedCompaction
Expand Down Expand Up @@ -645,6 +649,9 @@ func TestCompactionPickerL0(t *testing.T) {
}

func TestCompactionPickerConcurrency(t *testing.T) {
opts := (*Options)(nil).EnsureDefaults()
opts.Experimental.L0CompactionConcurrency = 1

parseMeta := func(s string) (*fileMetadata, error) {
parts := strings.Split(s, ":")
fileNum, err := strconv.Atoi(parts[0])
Expand All @@ -656,12 +663,14 @@ func TestCompactionPickerConcurrency(t *testing.T) {
if len(parts) != 2 {
return nil, errors.Errorf("malformed table spec: %s", s)
}
m := &fileMetadata{
FileNum: base.FileNum(fileNum),
Size: 1028,
Smallest: base.ParseInternalKey(strings.TrimSpace(parts[0])),
Largest: base.ParseInternalKey(strings.TrimSpace(parts[1])),
}
m := (&fileMetadata{
FileNum: base.FileNum(fileNum),
Size: 1028,
}).ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(strings.TrimSpace(parts[0])),
base.ParseInternalKey(strings.TrimSpace(parts[1])),
)
for _, p := range fields[1:] {
if strings.HasPrefix(p, "size=") {
v, err := strconv.Atoi(strings.TrimPrefix(p, "size="))
Expand All @@ -676,8 +685,6 @@ func TestCompactionPickerConcurrency(t *testing.T) {
return m, nil
}

opts := (*Options)(nil).EnsureDefaults()
opts.Experimental.L0CompactionConcurrency = 1
var picker *compactionPickerByScore
var inProgressCompactions []compactionInfo

Expand Down Expand Up @@ -874,12 +881,14 @@ func TestCompactionPickerPickReadTriggered(t *testing.T) {
if len(parts) != 2 {
return nil, errors.Errorf("malformed table spec: %s. usage: <file-num>:start.SET.1-end.SET.2", s)
}
m := &fileMetadata{
FileNum: base.FileNum(fileNum),
Size: 1028,
Smallest: base.ParseInternalKey(strings.TrimSpace(parts[0])),
Largest: base.ParseInternalKey(strings.TrimSpace(parts[1])),
}
m := (&fileMetadata{
FileNum: base.FileNum(fileNum),
Size: 1028,
}).ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(strings.TrimSpace(parts[0])),
base.ParseInternalKey(strings.TrimSpace(parts[1])),
)
for _, p := range fields[1:] {
if strings.HasPrefix(p, "size=") {
v, err := strconv.Atoi(strings.TrimPrefix(p, "size="))
Expand Down Expand Up @@ -1026,12 +1035,14 @@ func TestPickedCompactionSetupInputs(t *testing.T) {
if len(tableParts) != 2 {
t.Fatalf("malformed table spec: %s", s)
}
m := &fileMetadata{
Smallest: base.ParseInternalKey(strings.TrimSpace(tableParts[0])),
Largest: base.ParseInternalKey(strings.TrimSpace(tableParts[1])),
m := (&fileMetadata{
Compacting: compacting,
Size: fileSize,
}
}).ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(strings.TrimSpace(tableParts[0])),
base.ParseInternalKey(strings.TrimSpace(tableParts[1])),
)
m.SmallestSeqNum = m.Smallest.SeqNum()
m.LargestSeqNum = m.Largest.SeqNum()
return m
Expand Down Expand Up @@ -1138,10 +1149,12 @@ func TestPickedCompactionExpandInputs(t *testing.T) {
if len(parts) != 2 {
t.Fatalf("malformed table spec: %s", s)
}
return &fileMetadata{
Smallest: base.ParseInternalKey(parts[0]),
Largest: base.ParseInternalKey(parts[1]),
}
m := (&fileMetadata{}).ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(parts[0]),
base.ParseInternalKey(parts[1]),
)
return m
}

datadriven.RunTest(t, "testdata/compaction_expand_inputs",
Expand Down Expand Up @@ -1216,12 +1229,14 @@ func TestCompactionOutputFileSize(t *testing.T) {
if len(parts) != 2 {
return nil, errors.Errorf("malformed table spec: %s. usage: <file-num>:start.SET.1-end.SET.2", s)
}
m := &fileMetadata{
FileNum: base.FileNum(fileNum),
Size: 1028,
Smallest: base.ParseInternalKey(strings.TrimSpace(parts[0])),
Largest: base.ParseInternalKey(strings.TrimSpace(parts[1])),
}
m := (&fileMetadata{
FileNum: base.FileNum(fileNum),
Size: 1028,
}).ExtendPointKeyBounds(
opts.Comparer.Compare,
base.ParseInternalKey(strings.TrimSpace(parts[0])),
base.ParseInternalKey(strings.TrimSpace(parts[1])),
)
for _, p := range fields[1:] {
if strings.HasPrefix(p, "size=") {
v, err := strconv.Atoi(strings.TrimPrefix(p, "size="))
Expand Down
Loading