Skip to content

Commit 7f56ad3

Browse files
fix: sort files for adjacency testing (#26816) (#26879)
Co-authored-by: davidby-influx <72418212+davidby-influx@users.noreply.github.com>
1 parent d8ecd34 commit 7f56ad3

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

tsdb/engine/tsm1/compact_property_test.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,31 @@ type fileInfo struct {
3838
// This rule is important to maintain the ordering of files, with improper ordering we cannot determine which point is the newest point when overwrites occur.
3939
// We always want the newest write to win.
4040
func validateFileAdjacency(allFiles []string, groups []tsm1.CompactionGroup) error {
41-
var fileInfos []fileInfo
41+
fileInfos := make([]*fileInfo, 0, len(allFiles))
4242
for _, file := range allFiles {
4343
gen, seq, err := tsm1.DefaultParseFileName(file)
4444
if err != nil {
4545
return fmt.Errorf("failed to parse file %s: %v", file, err)
4646
}
47-
fileInfos = append(fileInfos, fileInfo{
47+
fileInfos = append(fileInfos, &fileInfo{
4848
filename: file,
4949
generation: gen,
5050
sequence: seq,
5151
})
5252
}
5353

54-
slices.SortFunc(fileInfos, func(a, b fileInfo) int {
54+
slices.SortFunc(fileInfos, func(a, b *fileInfo) int {
5555
if a.generation != b.generation {
5656
return a.generation - b.generation
5757
}
5858

5959
return a.sequence - b.sequence
6060
})
6161

62-
var fileMap = make(map[string]fileInfo, len(allFiles))
63-
for i, file := range allFiles {
64-
fileMap[file] = fileInfo{
65-
index: i,
66-
}
62+
var fileMap = make(map[string]*fileInfo, len(fileInfos))
63+
for i, fi := range fileInfos {
64+
fi.index = i
65+
fileMap[fi.filename] = fi
6766
}
6867

6968
for groupIndex, group := range groups {

0 commit comments

Comments
 (0)