Merge pull request #110 from vinted/rev_thanos_losertree

Revert "store: use loser trees"
vinted · Jun 4, 2024 · c4dae3f · c4dae3f
2 parents 0cfdd6a + b796a26
commit c4dae3f
Show file tree

Hide file tree

Showing 9 changed files with 140 additions and 402 deletions.
diff --git a/pkg/losertree/tree.go b/pkg/losertree/tree.go
diff --git a/pkg/losertree/tree_test.go b/pkg/losertree/tree_test.go
diff --git a/pkg/store/bucket.go b/pkg/store/bucket.go
@@ -1625,8 +1625,13 @@ func (s *BucketStore) Series(req *storepb.SeriesRequest, seriesSrv storepb.Store
 
 	// Merge the sub-results from each selected block.
 	tracing.DoInSpan(ctx, "bucket_store_merge_all", func(ctx context.Context) {
+		defer func() {
+			for _, resp := range respSets {
+				resp.Close()
+			}
+		}()
 		begin := time.Now()
-		set := NewResponseDeduplicator(NewProxyResponseLoserTree(respSets...))
+		set := NewDedupResponseHeap(NewProxyResponseHeap(respSets...))
 		for set.Next() {
 			at := set.At()
 			warn := at.GetWarning()

diff --git a/pkg/store/proxy.go b/pkg/store/proxy.go
@@ -362,7 +362,7 @@ func (s *ProxyStore) Series(originalRequest *storepb.SeriesRequest, srv storepb.
 
 	level.Debug(reqLogger).Log("msg", "Series: started fanout streams", "status", strings.Join(storeDebugMsgs, ";"))
 
-	respHeap := NewResponseDeduplicator(NewProxyResponseLoserTree(storeResponses...))
+	respHeap := NewDedupResponseHeap(NewProxyResponseHeap(storeResponses...))
 	for respHeap.Next() {
 		resp := respHeap.At()