Update Icing from upstream.

Descriptions:
======================================================================
Integrate ANTLR-based advanced query prototype with query processor.
======================================================================
[PersistentHashMap][6.1/x] Wrap the return value of KeyMapper::ComputeChecksum by StatusOr
======================================================================
[PersistentHashMap][6.0/x] Replace GetValuesToKeys with iterator for KeyMapper
======================================================================
[PersistentHashMap][5.1/x] Allow client to specify initial num buckets
======================================================================
[PersistentHashMap][5/x] Implement rehashing
======================================================================
Add SchemaType filter and Document Id filter in Search Suggestion API.
======================================================================
Follow up to cl/463377778
======================================================================
Add Document Id filters in Search Suggestion API.
======================================================================
Cleanup LSC: Replace inclusion of *_proto_portable.pb.h files coming from portable_proto_library() with *(!_proto_portable).pb.h coming from cc_proto_library().
======================================================================
Cleanup LSC: Replace inclusion of *_proto_portable.pb.h files coming from portable_proto_library() with *(!_proto_portable).pb.h coming from cc_proto_library().
======================================================================
Cloned from CL 464902284 by 'g4 patch'.
======================================================================
Cleanup LSC: Replace inclusion of *_proto_portable.pb.h files coming from portable_proto_library() with *(!_proto_portable).pb.h coming from cc_proto_library().
======================================================================
Cleanup Remove unused visibility specs (last referenced in codebase over 132 days ago).
======================================================================
Cleanup LSC: Replace inclusion of *_proto_portable.pb.h files coming from portable_proto_library() with *(!_proto_portable).pb.h coming from cc_proto_library().
======================================================================
Cleanup LSC: Replace inclusion of *_proto_portable.pb.h files coming from portable_proto_library() with *(!_proto_portable).pb.h coming from cc_proto_library().
======================================================================
Remove dsaadati@ from third_party/icing OWNERS
======================================================================
Cleanup Move package level default_copts attribute to copts.
======================================================================
Refactor QueryProcessor and QueryProcessTest in preparation for adding ANTLR prototype to parse queries with search_type EXPERIMENTAL_ICING_ADVANCED_QUERY.
======================================================================

Bug: 208654892
Bug: 230553264
Bug: 237324702
Bug: 193919210

Change-Id: I2f0a612747ccb754502489a9b168406532cffaee

1 files changed, 1 insertions, 17 deletions

diff --git a/icing/query/query-processor.h b/icing/query/query-processor.h
index f99576a..f544a7a 100644
--- a/icing/query/query-processor.h
+++ b/icing/query/query-processor.h
@@ -22,6 +22,7 @@
 #include "icing/index/iterator/doc-hit-info-iterator-filter.h"
 #include "icing/index/iterator/doc-hit-info-iterator.h"
 #include "icing/proto/search.pb.h"
+#include "icing/query/query-results.h"
 #include "icing/query/query-terms.h"
 #include "icing/schema/schema-store.h"
 #include "icing/store/document-store.h"
@@ -48,18 +49,6 @@ class QueryProcessor {
       const Normalizer* normalizer, const DocumentStore* document_store,
       const SchemaStore* schema_store);
 
-  struct QueryResults {
-    std::unique_ptr<DocHitInfoIterator> root_iterator;
-    // A map from section names to sets of terms restricted to those sections.
-    // Query terms that are not restricted are found at the entry with key "".
-    SectionRestrictQueryTermsMap query_terms;
-    // Hit iterators for the text terms in the query. These query_term_iterators
-    // are completely separate from the iterators that make the iterator tree
-    // beginning with root_iterator.
-    // This will only be populated when ranking_strategy == RELEVANCE_SCORE.
-    std::unordered_map<std::string, std::unique_ptr<DocHitInfoIterator>>
-        query_term_iterators;
-  };
   // Parse the search configurations (including the query, any additional
   // filters, etc.) in the SearchSpecProto into one DocHitInfoIterator.
   //
@@ -98,11 +87,6 @@ class QueryProcessor {
       const SearchSpecProto& search_spec,
       ScoringSpecProto::RankingStrategy::Code ranking_strategy);
 
-  // Return the options for the DocHitInfoIteratorFilter based on the
-  // search_spec.
-  DocHitInfoIteratorFilter::Options getFilterOptions(
-      const SearchSpecProto& search_spec);
-
   // Not const because we could modify/sort the hit buffer in the lite index at
   // query time.
   Index& index_;