Adjust generated samples

Signed-off-by: Kemal Akkoyun <[email protected]>
thanos-io · Mar 16, 2020 · cbd3ca1 · cbd3ca1
1 parent f00b1c8
commit cbd3ca1
Showing 1 changed file with 8 additions and 43 deletions.
diff --git a/test/e2e/compact_test.go b/test/e2e/compact_test.go
@@ -159,49 +159,14 @@ func TestCompact(t *testing.T) {
 					extLset:          labels.FromStrings("ext1", "value1", "replica", "1"),
 					mint:             timestamp.FromTime(now),
 					maxt:             timestamp.FromTime(now.Add(2 * time.Hour)),
-					samplesPerSeries: 120,
+					samplesPerSeries: 119,
 				},
 				{
 					series:           []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
 					extLset:          labels.FromStrings("ext1", "value1", "replica", "2"),
 					mint:             timestamp.FromTime(now),
 					maxt:             timestamp.FromTime(now.Add(1 * time.Hour)),
-					samplesPerSeries: 60,
-				},
-			},
-			replicaLabels:       []string{"replica"},
-			downsamplingEnabled: true,
-			query:               "{a=\"1\"}",
-
-			expected: []model.Metric{
-				{
-					"a":    "1",
-					"b":    "2",
-					"ext1": "value1",
-				},
-			},
-			expectOfModBlocks: 2,
-			expectOfBlocks:    1,
-			expectOfSamples:   179, // TODO(kakkoyun): ?
-			expectOfSeries:    1,
-			expectOfChunks:    2,
-		},
-		{
-			name: "(contains) vertically overlapping blocks with replica labels",
-			blocks: []blockDesc{
-				{
-					series:           []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
-					extLset:          labels.FromStrings("ext1", "value1", "replica", "1"),
-					mint:             timestamp.FromTime(now.Add(30 * time.Minute)),
-					maxt:             timestamp.FromTime(now.Add(1 * time.Hour)),
-					samplesPerSeries: 90,
-				},
-				{
-					series:           []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
-					extLset:          labels.FromStrings("ext1", "value1", "replica", "2"),
-					mint:             timestamp.FromTime(now),
-					maxt:             timestamp.FromTime(now.Add(2 * time.Hour)),
-					samplesPerSeries: 120,
+					samplesPerSeries: 59,
 				},
 			},
 			replicaLabels:       []string{"replica"},
@@ -217,7 +182,7 @@ func TestCompact(t *testing.T) {
 			},
 			expectOfModBlocks: 2,
 			expectOfBlocks:    1,
-			expectOfSamples:   210, // TODO(kakkoyun): ?
+			expectOfSamples:   119,
 			expectOfSeries:    1,
 			expectOfChunks:    2,
 		},
@@ -229,14 +194,14 @@ func TestCompact(t *testing.T) {
 					extLset:          labels.FromStrings("ext1", "value1", "replica", "1"),
 					mint:             timestamp.FromTime(now.Add(30 * time.Minute)),
 					maxt:             timestamp.FromTime(now.Add(150 * time.Minute)),
-					samplesPerSeries: 120,
+					samplesPerSeries: 119,
 				},
 				{
 					series:           []labels.Labels{labels.FromStrings("a", "1", "b", "2")},
 					extLset:          labels.FromStrings("ext1", "value1", "replica", "2"),
-					mint:             timestamp.FromTime(now.Add(-30 * time.Minute)),
-					maxt:             timestamp.FromTime(now.Add(90 * time.Minute)),
-					samplesPerSeries: 120,
+					mint:             timestamp.FromTime(now),
+					maxt:             timestamp.FromTime(now.Add(120 * time.Minute)),
+					samplesPerSeries: 119,
 				},
 			},
 			replicaLabels:       []string{"replica"},
@@ -252,7 +217,7 @@ func TestCompact(t *testing.T) {
 			},
 			expectOfModBlocks: 2,
 			expectOfBlocks:    1,
-			expectOfSamples:   240, // TODO(kakkoyun): ?
+			expectOfSamples:   149,
 			expectOfSeries:    1,
 			expectOfChunks:    2,
 		},