Sync from upstream.

Descriptions:

==========
Add last optimized time to GetOptimizeInfo.

==========
Update the implementation of snippeting to return property paths with value indices and remove the values_index field.

==========
Create builders for SchemaProto, SchemaTypeConfigProto and PropertyConfigProto.

==========
Rename some protos with the rules:
 - Remove "Native" prefix
 - Add "Proto" suffix for consistency with other protos

==========
Upgrade your minimum iOS version to 11.4.

==========
Fix PersistToDisk definitions to ensure that they properly call datasync. This change is meant to address the first part of ptd doc - that certain functions that claim to persist data don't actually explicitly flush.

==========
Change function call from has_field() to field()

==========
Add IcingStorageInfo.

==========
Add IndexStorageStats.

==========
Add SchemaStoreStorageStats.

==========
Add DocumentStoreStorageStats.

==========
Implement OptimizeStats.

==========
Remove the max number of results per query limit (1000) and replace it with a more flexible way to limit memory use by the result-state-manager.

==========
Add a test case to ensure we don't add UsageStore's checksum in DocumentStore's ComputeChecksum.

==========
Account for UsageStore in GetDiskUsage.

==========
Ensure that SchemaStore properly handles function calls when the schema isn't set.

==========
Remove jlpl_strict_deps feature from package declarations.

==========
Qualifies std::string in 3p directories

==========
Section restricts should influence the relevance score.

==========
Apply fixes upstream that were necessary to sync changes downstream. Also added a METADATA check to prevent any accidental adds of foo.proto.h includes.

==========
Remove the 'com.google.protobuf' to 'com.google.android.icing.protobuf' translation in the export_to_aosp script.

==========
Include usage store size in GetOptimizeInfo. This helps clients get a better idea of what savings they could get back if they called Optimize.

Change-Id: Ia2339c7987267a73c49dadf1ced4a0a8ef001d4c

1 files changed, 10 insertions, 5 deletions

diff --git a/icing/index/iterator/doc-hit-info-iterator-and.h b/icing/index/iterator/doc-hit-info-iterator-and.h
index faca785..8ceff44 100644
--- a/icing/index/iterator/doc-hit-info-iterator-and.h
+++ b/icing/index/iterator/doc-hit-info-iterator-and.h
@@ -47,13 +47,16 @@ class DocHitInfoIteratorAnd : public DocHitInfoIterator {
   std::string ToString() const override;
 
   void PopulateMatchedTermsStats(
-      std::vector<TermMatchInfo> *matched_terms_stats) const override {
+      std::vector<TermMatchInfo> *matched_terms_stats,
+      SectionIdMask filtering_section_mask = kSectionIdMaskAll) const override {
     if (doc_hit_info_.document_id() == kInvalidDocumentId) {
       // Current hit isn't valid, return.
       return;
     }
-    short_->PopulateMatchedTermsStats(matched_terms_stats);
-    long_->PopulateMatchedTermsStats(matched_terms_stats);
+    short_->PopulateMatchedTermsStats(matched_terms_stats,
+                                      filtering_section_mask);
+    long_->PopulateMatchedTermsStats(matched_terms_stats,
+                                     filtering_section_mask);
   }
 
  private:
@@ -78,13 +81,15 @@ class DocHitInfoIteratorAndNary : public DocHitInfoIterator {
   std::string ToString() const override;
 
   void PopulateMatchedTermsStats(
-      std::vector<TermMatchInfo> *matched_terms_stats) const override {
+      std::vector<TermMatchInfo> *matched_terms_stats,
+      SectionIdMask filtering_section_mask = kSectionIdMaskAll) const override {
     if (doc_hit_info_.document_id() == kInvalidDocumentId) {
       // Current hit isn't valid, return.
       return;
     }
     for (size_t i = 0; i < iterators_.size(); ++i) {
-      iterators_.at(i)->PopulateMatchedTermsStats(matched_terms_stats);
+      iterators_.at(i)->PopulateMatchedTermsStats(matched_terms_stats,
+                                                  filtering_section_mask);
     }
   }