Merge pull request #72 from DataDog/cmasson/fix_merge_with_after_clear

Fix merge after clear in the buffered paginated store
DataDog · Apr 19, 2023 · 3b624d1 · 3b624d1
2 parents 8a1961c + c6dc109
commit 3b624d1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/ddsketch/store/buffered_paginated.go b/ddsketch/store/buffered_paginated.go
@@ -379,6 +379,9 @@ func (s *BufferedPaginatedStore) MergeWith(other Store) {
 	if ok && s.pageLenLog2 == o.pageLenLog2 {
 		// Merge pages.
 		for oPageOffset, oPage := range o.pages {
+			if len(oPage) == 0 {
+				continue
+			}
 			oPageIndex := o.minPageIndex + oPageOffset
 			page := s.page(oPageIndex, true)
 			for i, oCount := range oPage {

diff --git a/ddsketch/store/store_test.go b/ddsketch/store/store_test.go
@@ -300,6 +300,23 @@ func TestMergeFuzzy(t *testing.T) {
 	}
 }
 
+func TestMergeAfterClear(t *testing.T) {
+	for _, testCase := range testCases {
+		t.Run(testCase.name, func(t *testing.T) {
+			s1 := testCase.newStore()
+			s2 := testCase.newStore()
+
+			for i := 0; i < 1000; i++ {
+				s2.Add(i)
+			}
+			s2.Clear()
+
+			s1.MergeWith(s2)
+			s2.MergeWith(s1)
+		})
+	}
+}
+
 func testStore(t *testing.T, store Store, normalizedBins []Bin) {
 	assertEncodeBins(t, store, normalizedBins)
 	testCopy(t, store, normalizedBins)