Fix chunk dedupe iterator

for the case when chunks have same from/through time, but different checksums Signed-off-by: Christian Haudum <[email protected]>
grafana · Apr 26, 2024 · 2a084f3 · 2a084f3
1 parent b6905ce
commit 2a084f3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/pkg/bloomgateway/client.go b/pkg/bloomgateway/client.go
@@ -361,7 +361,7 @@ func mergeChunks(inputs ...[]*logproto.ShortRef) []*logproto.ShortRef {
 		v1.NewPeekingIter[*logproto.ShortRef](
 			v1.NewHeapIterator[*logproto.ShortRef](
 				func(a, b *logproto.ShortRef) bool {
-					return a.From.Before(b.From) || (a.From.Equal(b.From) && a.Through.Before(b.Through))
+					return a.From.Before(b.From) || (a.From.Equal(b.From) && a.Through.Before(b.Through)) || a.Checksum < b.Checksum
 				},
 				iters...,
 			),

diff --git a/pkg/bloomgateway/client_test.go b/pkg/bloomgateway/client_test.go
@@ -70,3 +70,20 @@ func TestGatewayClient_MergeSeries(t *testing.T) {
 	result, _ := mergeSeries(inputs, nil)
 	require.Equal(t, expected, result)
 }
+
+func TestGatewayClient_MergeChunks(t *testing.T) {
+	inputs := [][]*logproto.ShortRef{
+		{shortRef(0, 1, 1), shortRef(1, 2, 2)},
+		{shortRef(0, 1, 1), shortRef(1, 2, 3)},
+		{shortRef(0, 1, 1), shortRef(1, 2, 2)},
+	}
+
+	expected := []*logproto.ShortRef{
+		shortRef(0, 1, 1),
+		shortRef(1, 2, 2),
+		shortRef(1, 2, 3),
+	}
+
+	result := mergeChunks(inputs...)
+	require.Equal(t, expected, result)
+}