diff options
| author | Grace Zhao <gracezrx@google.com> | 2022-09-08 20:26:31 +0000 |
|---|---|---|
| committer | Grace Zhao <gracezrx@google.com> | 2022-09-08 22:53:11 +0000 |
| commit | b02eecda6a12241798cdbaaa7069d19f2fc5f41f (patch) | |
| tree | 15687379068030d4d5443c916d91e9ed364f9b39 /icing/index/iterator/doc-hit-info-iterator-or.cc | |
| parent | 87267cbc5531600072a283ba0c9500c3fcac87af (diff) | |
| download | icing-b02eecda6a12241798cdbaaa7069d19f2fc5f41f.tar.gz | |
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
Diffstat (limited to 'icing/index/iterator/doc-hit-info-iterator-or.cc')
| -rw-r--r-- | icing/index/iterator/doc-hit-info-iterator-or.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/icing/index/iterator/doc-hit-info-iterator-or.cc b/icing/index/iterator/doc-hit-info-iterator-or.cc index b4234e0..655cafc 100644 --- a/icing/index/iterator/doc-hit-info-iterator-or.cc +++ b/icing/index/iterator/doc-hit-info-iterator-or.cc @@ -115,7 +115,8 @@ libtextclassifier3::Status DocHitInfoIteratorOr::Advance() { // If equal, combine. if (left_document_id_ == right_document_id_) { - doc_hit_info_.MergeSectionsFrom(right_->doc_hit_info()); + doc_hit_info_.MergeSectionsFrom( + right_->doc_hit_info().hit_section_ids_mask()); hit_intersect_section_ids_mask_ &= right_->hit_intersect_section_ids_mask(); } @@ -195,7 +196,8 @@ libtextclassifier3::Status DocHitInfoIteratorOrNary::Advance() { hit_intersect_section_ids_mask_ = iterator->hit_intersect_section_ids_mask(); } else { - doc_hit_info_.MergeSectionsFrom(iterator->doc_hit_info()); + doc_hit_info_.MergeSectionsFrom( + iterator->doc_hit_info().hit_section_ids_mask()); hit_intersect_section_ids_mask_ &= iterator->hit_intersect_section_ids_mask(); } |