From 85b60b594e93ee221963b93430d5a7447b93560d Mon Sep 17 00:00:00 2001
From: Jackson Owens <jackson@cockroachlabs.com>
Date: Fri, 5 Jan 2024 16:33:59 -0500
Subject: [PATCH] db: fix unpropagated error in Iterator.mergeForward

Previously, if the underlying internal iterator encountered an error while
merging MERGE keys in the forward direction, the iterator would stop merging
and return a key representing the partially merged state up until the error.
This commit fixes the bug and adds a regression test.
---
 iterator.go                    |  3 +++
 testdata/iter_histories/errors | 36 ++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/iterator.go b/iterator.go
index ca2189402d..11a92f38b4 100644
--- a/iterator.go
+++ b/iterator.go
@@ -1147,6 +1147,9 @@ func (i *Iterator) mergeNext(key InternalKey, valueMerger ValueMerger) {
 		i.iterKey, i.iterValue = i.iter.Next()
 		i.stats.ForwardStepCount[InternalIterCall]++
 		if i.iterKey == nil {
+			if i.err = i.iter.Error(); i.err != nil {
+				return
+			}
 			i.pos = iterPosNext
 			return
 		}
diff --git a/testdata/iter_histories/errors b/testdata/iter_histories/errors
index 3f57af3094..b6e955afcd 100644
--- a/testdata/iter_histories/errors
+++ b/testdata/iter_histories/errors
@@ -222,3 +222,39 @@ e: (e1, .)
 d: (d1, .)
 c: (c1, .)
 err=injected error
+
+# Test a simple MERGE scenario where an error occurs while the top-level
+# Iterator is merging MERGE keys.
+
+define auto-compactions=off block-size=1 snapshots=(1,2,3,4)
+L1
+    a.MERGE.1:a1
+    a.MERGE.2:a2
+    a.MERGE.3:a3
+    a.MERGE.4:a4
+----
+1:
+  000004:[a#4,MERGE-a#1,MERGE]
+
+layout filename=000004.sst
+----
+         0  data (22)
+        27  data (22)
+        54  data (22)
+        81  data (22)
+       108  index (71)
+       184  properties (642)
+       831  meta-index (33)
+       869  footer (53)
+       922  EOF
+
+
+reopen auto-compactions=off enable-table-stats=false inject-errors=((ErrInjected (And (PathMatch "000004.sst") (OpFileReadAt 54))))
+----
+
+combined-iter
+first
+last
+----
+err=injected error
+err=injected error