mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 13:57:36 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Added more cases and modified one var name.

Browse source 
Signed-off-by: Bartek Plotka <bwplotka@gmail.com>
This commit is contained in:
Bartek Plotka 2018-03-29 12:50:46 +01:00
parent f07d829946
commit 7412e2b44b
2 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
db.go
View file

@ -576,6 +576,9 @@ func validateBlockSequence(bs []*Block) error {
return nil return nil
} }
type TimeRange struct {
MaxTime, MinTime int64
}
// OverlappingBlocks returns all overlapping blocks from given meta files. // OverlappingBlocks returns all overlapping blocks from given meta files.
// We sort blocks by minTime. Then we iterate over each block minTime and treat it as our "current" timestamp. // We sort blocks by minTime. Then we iterate over each block minTime and treat it as our "current" timestamp.
// We check all the pending blocks (blocks that we have seen their minTimes, but their maxTime was still ahead current // We check all the pending blocks (blocks that we have seen their minTimes, but their maxTime was still ahead current
@ -592,8 +595,8 @@ func OverlappingBlocks(bm []BlockMeta) (overlaps [][]BlockMeta) {
var ( var (
// pending contains not ended blocks in regards to "current" timestamp. // pending contains not ended blocks in regards to "current" timestamp.
pending = []BlockMeta{bm[0]} pending = []BlockMeta{bm[0]}
// Same pending helps to aggregate same overlaps to single group. // continuousPending helps to aggregate same overlaps to single group.
samePendings = true continuousPending = true
) )
for _, b := range bm[1:] { for _, b := range bm[1:] {
var newPending []BlockMeta var newPending []BlockMeta
@ -601,7 +604,7 @@ func OverlappingBlocks(bm []BlockMeta) (overlaps [][]BlockMeta) {
for _, p := range pending { for _, p := range pending {
// "b.MinTime" is our current time. // "b.MinTime" is our current time.
if b.MinTime >= p.MaxTime { if b.MinTime >= p.MaxTime {
samePendings = false continuousPending = false
continue continue
} }
@ -616,12 +619,13 @@ func OverlappingBlocks(bm []BlockMeta) (overlaps [][]BlockMeta) {
continue continue
} }
if samePendings && len(overlaps) > 0 { if continuousPending && len(overlaps) > 0 {
overlaps[len(overlaps)-1] = append(overlaps[len(overlaps)-1], b) overlaps[len(overlaps)-1] = append(overlaps[len(overlaps)-1], b)
continue continue
} }
overlaps = append(overlaps, append(newPending, b)) overlaps = append(overlaps, append(newPending, b))
samePendings = true // Start new pendings.
continuousPending = true
} }
return overlaps return overlaps
} }

25
db_test.go
View file

@ -940,4 +940,29 @@ func TestOverlappingBlocksDetectsAllOverlaps(t *testing.T) {
{metas[6], o5}, {o5, metas[7]}, {o5, metas[8]}, {metas[6], o5}, {o5, metas[7]}, {o5, metas[8]},
{metas[9], o6a, o6b}, {o6a, metas[10]}, {metas[9], o6a, o6b}, {o6a, metas[10]},
}, OverlappingBlocks(append(metas, o1, o2, o3a, o3b, o4, o5, o6a, o6b))) }, OverlappingBlocks(append(metas, o1, o2, o3a, o3b, o4, o5, o6a, o6b)))
// Additional cases.
a1 := BlockMeta{MinTime: 1, MaxTime: 5}
a2 := BlockMeta{MinTime: 1, MaxTime: 2}
a3 := BlockMeta{MinTime: 3, MaxTime: 4}
a4 := BlockMeta{MinTime: 3, MaxTime: 4}
testutil.Equals(t, [][]BlockMeta{{a1, a2}, {a1, a3, a4}}, OverlappingBlocks(append([]BlockMeta{a1}, a2, a3, a4)))
var nc1 []BlockMeta
nc1 = append(nc1, BlockMeta{MinTime: 1, MaxTime: 5})
nc1 = append(nc1, BlockMeta{MinTime: 2, MaxTime: 3})
nc1 = append(nc1, BlockMeta{MinTime: 2, MaxTime: 3})
nc1 = append(nc1, BlockMeta{MinTime: 2, MaxTime: 3})
nc1 = append(nc1, BlockMeta{MinTime: 2, MaxTime: 3})
nc1 = append(nc1, BlockMeta{MinTime: 2, MaxTime: 6})
nc1 = append(nc1, BlockMeta{MinTime: 3, MaxTime: 5})
nc1 = append(nc1, BlockMeta{MinTime: 5, MaxTime: 7})
nc1 = append(nc1, BlockMeta{MinTime: 7, MaxTime: 10})
nc1 = append(nc1, BlockMeta{MinTime: 8, MaxTime: 9})
testutil.Equals(t, [][]BlockMeta{
{nc1[0], nc1[1], nc1[2], nc1[3], nc1[4], nc1[5]}, // 1-5, 2-3, 2-3, 2-3, 2-3, 2,6
{nc1[0], nc1[5], nc1[6]}, // 1-5, 2-6, 3-5
{nc1[5], nc1[7]}, // 2-6, 5-7
{nc1[8], nc1[9]}, // 7-10, 8-9
}, OverlappingBlocks(nc1))
} }