Sync from upstream.

Descriptions:
======================================================================
[FileBackedVector Consolidation][4/x] Fix potential PWrite bug in GrowIfNecessary
======================================================================
[FileBackedVector Consolidation][5/x] Create benchmark for FileBackedVector
======================================================================
[FileBackedVector Consolidation][6/x] Avoid calling GetFileSize in GrowIfNecessary
======================================================================
[PersistentHashMap][3.3/x] Implement Delete
======================================================================
Fix the PopulateMatchedTermsStats bug
======================================================================
Add JNI latency for query latency stats breakdown.
======================================================================
[ResultStateManager] Thread safety test1
======================================================================
[ResultStateManager][2/x] Thread safety test2
======================================================================
Add native lock contention latency for measuring query latency
======================================================================
Fix implementation of HasMember operator in ANTLR-based list-filter prototype.
======================================================================
Fix improper uses of std::string_view
======================================================================
Extend the scale of Icing
======================================================================
Decouple the term frequency array from DocHitInfo
======================================================================
Disable hit_term_frequency for non-relevance queries
======================================================================
[ResultStateManager][3/x] Thread safety test3
======================================================================
[PersistentHashMap][4/x] Implement iterator
=======================================================================
Fix the lite index compaction bug
=======================================================================

Change-Id: I0edad67affed97af107e2d7cd73770e0268c0903

1 files changed, 4 insertions, 4 deletions

diff --git a/icing/index/iterator/doc-hit-info-iterator-section-restrict_test.cc b/icing/index/iterator/doc-hit-info-iterator-section-restrict_test.cc
index 7c6d924..485f85b 100644
--- a/icing/index/iterator/doc-hit-info-iterator-section-restrict_test.cc
+++ b/icing/index/iterator/doc-hit-info-iterator-section-restrict_test.cc
@@ -121,12 +121,12 @@ TEST_F(DocHitInfoIteratorSectionRestrictTest,
   // Created to test correct section_id_mask behavior.
   SectionIdMask original_section_id_mask = 0b00000101;  // hits in sections 0, 2
 
-  DocHitInfo doc_hit_info1 = DocHitInfo(document_id);
+  DocHitInfoTermFrequencyPair doc_hit_info1 = DocHitInfo(document_id);
   doc_hit_info1.UpdateSection(/*section_id=*/0, /*hit_term_frequency=*/1);
   doc_hit_info1.UpdateSection(/*section_id=*/2, /*hit_term_frequency=*/2);
 
   // Create a hit that was found in the indexed section
-  std::vector<DocHitInfo> doc_hit_infos = {doc_hit_info1};
+  std::vector<DocHitInfoTermFrequencyPair> doc_hit_infos = {doc_hit_info1};
 
   auto original_iterator =
       std::make_unique<DocHitInfoIteratorDummy>(doc_hit_infos, "hi");
@@ -152,8 +152,8 @@ TEST_F(DocHitInfoIteratorSectionRestrictTest,
 
   section_restrict_iterator.PopulateMatchedTermsStats(&matched_terms_stats);
   EXPECT_EQ(matched_terms_stats.at(0).term, "hi");
-  std::array<Hit::TermFrequency, kMaxSectionId> expected_term_frequencies{
-      1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+  std::array<Hit::TermFrequency, kTotalNumSections> expected_term_frequencies{
+      1};
   EXPECT_THAT(matched_terms_stats.at(0).term_frequencies,
               ElementsAreArray(expected_term_frequencies));
   EXPECT_EQ(matched_terms_stats.at(0).section_ids_mask,