summaryrefslogtreecommitdiff
path: root/table
diff options
context:
space:
mode:
authormrambacher <mrambach@gmail.com>2020-08-24 16:41:42 -0700
committerFacebook GitHub Bot <facebook-github-bot@users.noreply.github.com>2020-08-24 16:43:31 -0700
commitb7e1c5213f0011262ad7ef2ac00341cf302eb4f3 (patch)
treeb11fb58df6dfa65337810f1c1f2f01e5c7a9c081 /table
parente653af716497f1284fedc7d0afecb118b4e812e3 (diff)
Add some simulator cache and block tracer tests to ASSERT_STATUS_CHECKED (#7305)
Summary: More tests now pass. When in doubt, I added a TODO comment to check what should happen with an ignored error. Pull Request resolved: https://github.com/facebook/rocksdb/pull/7305 Reviewed By: akankshamahajan15 Differential Revision: D23301262 Pulled By: ajkr fbshipit-source-id: 5f120edc7393560aefc0633250277bbc7e8de9e6
Diffstat (limited to 'table')
-rw-r--r--table/merging_iterator.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/table/merging_iterator.cc b/table/merging_iterator.cc
index 60830c128..fdd1a4910 100644
--- a/table/merging_iterator.cc
+++ b/table/merging_iterator.cc
@@ -79,6 +79,7 @@ class MergingIterator : public InternalIterator {
for (auto& child : children_) {
child.DeleteIter(is_arena_mode_);
}
+ status_.PermitUncheckedError();
}
bool Valid() const override { return current_ != nullptr && status_.ok(); }