1 files changed, 6 insertions, 3 deletions
diff --git a/icing/index/main/doc-hit-info-iterator-term-main.cc b/icing/index/main/doc-hit-info-iterator-term-main.cc
index 5cf6a4c..3e66858 100644
--- a/icing/index/main/doc-hit-info-iterator-term-main.cc
+++ b/icing/index/main/doc-hit-info-iterator-term-main.cc
@@ -100,13 +100,12 @@ libtextclassifier3::Status DocHitInfoIteratorTermMain::Advance() {
     // Nothing more for the iterator to return. Set these members to invalid
     // values.
     doc_hit_info_ = DocHitInfo();
-    hit_intersect_section_ids_mask_ = kSectionIdMaskNone;
     return absl_ports::ResourceExhaustedError(
         "No more DocHitInfos in iterator");
   }
+  ++num_advance_calls_;
   doc_hit_info_ =
       cached_doc_hit_infos_.at(cached_doc_hit_infos_idx_).doc_hit_info;
-  hit_intersect_section_ids_mask_ = doc_hit_info_.hit_section_ids_mask();
   return libtextclassifier3::Status::OK;
 }
 
@@ -139,7 +138,9 @@ libtextclassifier3::Status DocHitInfoIteratorTermMainExact::RetrieveMoreHits() {
                          posting_list_accessor_->GetNextHitsBatch());
   if (hits.empty()) {
     all_pages_consumed_ = true;
+    return libtextclassifier3::Status::OK;
   }
+
   ++num_blocks_inspected_;
   cached_doc_hit_infos_.reserve(cached_doc_hit_infos_.size() + hits.size());
   for (const Hit& hit : hits) {
@@ -177,7 +178,6 @@ DocHitInfoIteratorTermMainPrefix::RetrieveMoreHits() {
     cached_doc_hit_infos_.push_back(std::move(last_doc_hit_info));
   }
 
-  ++num_blocks_inspected_;
   if (posting_list_accessor_ == nullptr) {
     ICING_ASSIGN_OR_RETURN(MainIndex::GetPrefixAccessorResult result,
                            main_index_->GetAccessorForPrefixTerm(term_));
@@ -188,7 +188,10 @@ DocHitInfoIteratorTermMainPrefix::RetrieveMoreHits() {
                          posting_list_accessor_->GetNextHitsBatch());
   if (hits.empty()) {
     all_pages_consumed_ = true;
+    return libtextclassifier3::Status::OK;
   }
+
+  ++num_blocks_inspected_;
   cached_doc_hit_infos_.reserve(cached_doc_hit_infos_.size() + hits.size());
   for (const Hit& hit : hits) {
     // Check sections.