Fix slow no-io iterator

Summary:
This fixes #3130525. Dhruba's suggestion and Tnovak's implementation :)

The issue was with SkipEmptyDataBlocksForward(), but I also changed SkipEmptyDataBlocksBackward(). Is that OK?

Test Plan: Run the logdevice test

Reviewers: dhruba

Reviewed By: dhruba

CC: leveldb
Differential Revision: https://reviews.facebook.net/D13911

diff --git a/table/two_level_iterator.cc b/table/two_level_iterator.cc
index 965aa65a158d02a8a51a70b9415af63303a5337d..ac2d8d3d986bc9083a3529b9827cd9d8ffce577c 100644 (file)
--- a/table/two_level_iterator.cc
+++ b/table/two_level_iterator.cc
@@ -139,7 +139,8 @@ void TwoLevelIterator::Prev() {
 
 
 void TwoLevelIterator::SkipEmptyDataBlocksForward() {
-  while (data_iter_.iter() == nullptr || !data_iter_.Valid()) {
+  while (data_iter_.iter() == nullptr || (!data_iter_.Valid() &&
+        !data_iter_.status().IsIncomplete())) {
     // Move to next block
     if (!index_iter_.Valid()) {
       SetDataIterator(nullptr);
@@ -152,7 +153,8 @@ void TwoLevelIterator::SkipEmptyDataBlocksForward() {
 }
 
 void TwoLevelIterator::SkipEmptyDataBlocksBackward() {
-  while (data_iter_.iter() == nullptr || !data_iter_.Valid()) {
+  while (data_iter_.iter() == nullptr || (!data_iter_.Valid() &&
+        !data_iter_.status().IsIncomplete())) {
     // Move to next block
     if (!index_iter_.Valid()) {
       SetDataIterator(nullptr);