From 009dd2cde506e5b0ae7191a08ec2867fdb5a2eab Mon Sep 17 00:00:00 2001
From: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
Date: Mon, 22 May 2017 10:31:50 +0530
Subject: [PATCH] Add test for mergedTombstoneReader

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
---
 tombstones.go      |   3 +-
 tombstones_test.go | 116 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/tombstones.go b/tombstones.go
index b0d8eca41..76ef2dacc 100644
--- a/tombstones.go
+++ b/tombstones.go
@@ -377,11 +377,12 @@ func (t *mergedTombstoneReader) Next() bool {
 		t.cur = bcur
 		t.bok = t.b.Next()
 	} else {
-		t.cur = acur
 		// Merge time ranges.
 		for _, r := range bcur.ranges {
 			acur.ranges = addNewInterval(acur.ranges, r)
 		}
+
+		t.cur = acur
 		t.aok = t.a.Next()
 		t.bok = t.b.Next()
 	}
diff --git a/tombstones_test.go b/tombstones_test.go
index 1506d74de..0793a1cb3 100644
--- a/tombstones_test.go
+++ b/tombstones_test.go
@@ -63,6 +63,11 @@ func TestAddingNewIntervals(t *testing.T) {
 			new:   trange{21, 23},
 			exp:   []trange{{1, 10}, {12, 20}, {21, 23}, {25, 30}},
 		},
+		{
+			exist: []trange{{1, 2}, {3, 5}, {6, 7}},
+			new:   trange{6, 7},
+			exp:   []trange{{1, 2}, {3, 5}, {6, 7}},
+		},
 		{
 			exist: []trange{{1, 10}, {12, 20}, {25, 30}},
 			new:   trange{21, 25},
@@ -199,3 +204,114 @@ func TestTombstoneReadersSeek(t *testing.T) {
 		return
 	})
 }
+
+func TestMergedTombstoneReader(t *testing.T) {
+	cases := []struct {
+		a, b TombstoneReader
+
+		exp TombstoneReader
+	}{
+		{
+			a: newMapTombstoneReader(
+				map[uint32][]trange{
+					2:    []trange{{1, 2}},
+					3:    []trange{{1, 4}, {5, 6}},
+					4:    []trange{{10, 15}, {16, 20}},
+					5:    []trange{{1, 4}, {5, 6}},
+					50:   []trange{{10, 20}, {35, 50}},
+					600:  []trange{{100, 2000}},
+					1000: []trange{},
+					1500: []trange{{10000, 500000}},
+					1600: []trange{{1, 2}, {3, 4}, {4, 5}, {6, 7}},
+				},
+			),
+			b: newMapTombstoneReader(
+				map[uint32][]trange{
+					2:    []trange{{1, 2}},
+					3:    []trange{{1, 4}, {5, 6}},
+					4:    []trange{{10, 15}, {16, 20}},
+					5:    []trange{{1, 4}, {5, 6}},
+					50:   []trange{{10, 20}, {35, 50}},
+					600:  []trange{{100, 2000}},
+					1000: []trange{},
+					1500: []trange{{10000, 500000}},
+					1600: []trange{{1, 2}, {3, 4}, {4, 5}, {6, 7}},
+				},
+			),
+
+			exp: newMapTombstoneReader(
+				map[uint32][]trange{
+					2:    []trange{{1, 2}},
+					3:    []trange{{1, 4}, {5, 6}},
+					4:    []trange{{10, 15}, {16, 20}},
+					5:    []trange{{1, 4}, {5, 6}},
+					50:   []trange{{10, 20}, {35, 50}},
+					600:  []trange{{100, 2000}},
+					1000: []trange{},
+					1500: []trange{{10000, 500000}},
+					1600: []trange{{1, 2}, {3, 5}, {6, 7}},
+				},
+			),
+		},
+		{
+			a: newMapTombstoneReader(
+				map[uint32][]trange{
+					2:    []trange{{1, 2}},
+					3:    []trange{{1, 4}, {5, 6}},
+					4:    []trange{{10, 15}, {16, 20}},
+					5:    []trange{{1, 4}, {5, 6}},
+					50:   []trange{{10, 20}, {35, 50}},
+					600:  []trange{{100, 2000}},
+					1000: []trange{},
+					1500: []trange{{10000, 500000}},
+					1600: []trange{{1, 2}, {3, 4}, {4, 5}, {6, 7}},
+				},
+			),
+			b: newMapTombstoneReader(
+				map[uint32][]trange{
+					20:    []trange{{1, 2}},
+					30:    []trange{{1, 4}, {5, 6}},
+					40:    []trange{{10, 15}, {16, 20}},
+					60:    []trange{{1, 4}, {5, 6}},
+					500:   []trange{{10, 20}, {35, 50}},
+					6000:  []trange{{100, 2000}},
+					10000: []trange{},
+					15000: []trange{{10000, 500000}},
+					1600:  []trange{{1, 2}, {3, 4}, {4, 5}, {6, 7}},
+				},
+			),
+
+			exp: newMapTombstoneReader(
+				map[uint32][]trange{
+					2:     []trange{{1, 2}},
+					3:     []trange{{1, 4}, {5, 6}},
+					4:     []trange{{10, 15}, {16, 20}},
+					5:     []trange{{1, 4}, {5, 6}},
+					50:    []trange{{10, 20}, {35, 50}},
+					600:   []trange{{100, 2000}},
+					1000:  []trange{},
+					1500:  []trange{{10000, 500000}},
+					20:    []trange{{1, 2}},
+					30:    []trange{{1, 4}, {5, 6}},
+					40:    []trange{{10, 15}, {16, 20}},
+					60:    []trange{{1, 4}, {5, 6}},
+					500:   []trange{{10, 20}, {35, 50}},
+					6000:  []trange{{100, 2000}},
+					10000: []trange{},
+					15000: []trange{{10000, 500000}},
+					1600:  []trange{{1, 2}, {3, 5}, {6, 7}},
+				},
+			),
+		},
+	}
+
+	for _, c := range cases {
+		res := newMergedTombstoneReader(c.a, c.b)
+		for c.exp.Next() {
+			require.True(t, res.Next())
+			require.Equal(t, c.exp.At(), res.At())
+		}
+		require.False(t, res.Next())
+	}
+	return
+}