rebase master

Signed-off-by: Krasi Georgiev <[email protected]>

Author: Krasi Georgiev

scan.go

@@ -332,11 +332,11 @@ func removeCompleteOutsiders(chks []chunks.Meta, mint int64, maxt int64) ([]chun
 	goodChunks := make([]chunks.Meta, 0, len(chks))
 	for _, c := range chks {
 		// min or max chunk time is within the time range. We don't remove partial outsiders.
-		if intervalOverlap(mint, maxt, c.MinTime, c.MaxTime) {
+		if c.OverlapsClosedInterval(mint, maxt) {
 			// Skip if the chunk is overlapping with the previous one.
 			if len(goodChunks) > 0 {
 				last := goodChunks[len(goodChunks)-1]
-				if intervalOverlap(c.MinTime, c.MaxTime, last.MinTime, last.MaxTime) {
+				if c.OverlapsClosedInterval(last.MinTime, last.MaxTime) {
 					continue
 				}
 			}
@@ -361,7 +361,7 @@ func repairPartialOutsiders(chks []chunks.Meta, mint int64, maxt int64) ([]chunk
 			MinTime: 0,
 			Ref:     c.Ref,
 		}
-		if intervalOverlap(mint, maxt, c.MinTime, c.MaxTime) && (c.MinTime < mint || c.MaxTime > maxt) {
+		if c.OverlapsClosedInterval(mint, maxt) && (c.MinTime < mint || c.MaxTime > maxt) {
 			repairedChunk.Ref = c.Ref
 			app, err := repairedChunk.Chunk.Appender()
 			if err != nil {
@@ -449,22 +449,20 @@ func indexStats(bdir string) (IndexStats, error) {
 		stats.ChunksTotal += len(chks)
 
 		for i, c := range chks {
-			var lastChunk chunks.Meta
 			if i > 0 {
-				lastChunk = chks[i-1]
+				// Overlapping chunks.
+				if c.OverlapsClosedInterval(chks[i-1].MinTime, chks[i-1].MaxTime) {
+					ooo++
+				}
 			}
 
-			if !intervalOverlap(block.Meta().MinTime, block.Meta().MaxTime, c.MinTime, c.MaxTime) {
+			if !c.OverlapsClosedInterval(block.Meta().MinTime, block.Meta().MaxTime) {
 				stats.ChunksEntireOutsiders++
 			} else if c.MinTime < block.Meta().MinTime || c.MaxTime > block.Meta().MaxTime {
 				stats.ChunksPartialOutsiders++
 
 			}
 
-			// Overlapping chunks.
-			if intervalOverlap(lastChunk.MinTime, lastChunk.MaxTime, c.MinTime, c.MaxTime) {
-				ooo++
-			}
 		}
 		if ooo > 0 {
 			stats.ChunksOverlapingTotal += ooo