diff options
| author | Grace Zhao <gracezrx@google.com> | 2023-06-28 15:35:44 -0700 |
|---|---|---|
| committer | Grace Zhao <gracezrx@google.com> | 2023-06-28 22:39:16 +0000 |
| commit | b8e8a914804b5ef6ee8ca77a9ca7b9797fe55e94 (patch) | |
| tree | fa0309938bf2b0d5155b94cb2516cb3142536556 /icing/join/qualified-id-join-indexing-handler.cc | |
| parent | 3a5d5836780120152cfade6a77ba233efbac5070 (diff) | |
| parent | f1f564329ad560f580c03f9e928057ad4e4fadc9 (diff) | |
| download | icing-b8e8a914804b5ef6ee8ca77a9ca7b9797fe55e94.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into androidx-main
* aosp/upstream-master:
Update Icing from upstream.
Descriptions:
========================================================================
[Join][cleanup][ez] Rename QualifiedIdTypeJoinableIndex as QualifiedIdJoinIndex
========================================================================
Better evaluation for persistent hash map size in join index
========================================================================
Add num_to_score into ResultSpecProto
========================================================================
[Indexable_nested_properties_list 1/5] Add indexable_nested_properties to DocumentIndexingConfig and check it during schema validation.
========================================================================
[Indexable_nested_properties_list 2/5] Add check for indexable_neseted_properties when computing SchemaDelta
========================================================================
[Indexable_nested_properties_list 3/5] Add indexable_nested_properties to schema-property-iterator
========================================================================
[Indexable_nested_properties_list 4/5] Integrate circular schema definitions with schema-property-iterator
========================================================================
Bug: 272145329
Bug: 284232550
Bug: 285636503
Bug: 265304217
Bug: 289150947
Change-Id: Icfcd4901015b75f4af2d231f8a8613c6e33034a0
Diffstat (limited to 'icing/join/qualified-id-join-indexing-handler.cc')
| -rw-r--r-- | icing/join/qualified-id-join-indexing-handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/icing/join/qualified-id-join-indexing-handler.cc b/icing/join/qualified-id-join-indexing-handler.cc index 86af043..344cf41 100644 --- a/icing/join/qualified-id-join-indexing-handler.cc +++ b/icing/join/qualified-id-join-indexing-handler.cc @@ -21,7 +21,7 @@ #include "icing/text_classifier/lib3/utils/base/statusor.h" #include "icing/absl_ports/canonical_errors.h" #include "icing/join/doc-join-info.h" -#include "icing/join/qualified-id-type-joinable-index.h" +#include "icing/join/qualified-id-join-index.h" #include "icing/join/qualified-id.h" #include "icing/legacy/core/icing-string-util.h" #include "icing/proto/logging.pb.h" @@ -38,7 +38,7 @@ namespace lib { /* static */ libtextclassifier3::StatusOr< std::unique_ptr<QualifiedIdJoinIndexingHandler>> QualifiedIdJoinIndexingHandler::Create( - const Clock* clock, QualifiedIdTypeJoinableIndex* qualified_id_join_index) { + const Clock* clock, QualifiedIdJoinIndex* qualified_id_join_index) { ICING_RETURN_ERROR_IF_NULL(clock); ICING_RETURN_ERROR_IF_NULL(qualified_id_join_index); |