diff options
| author | Tim Barron <tjbarron@google.com> | 2024-03-07 00:42:57 +0000 |
|---|---|---|
| committer | Tim Barron <tjbarron@google.com> | 2024-03-12 15:41:59 +0000 |
| commit | 29d4712b67d1ade154739e5fa9a9a7970afe6c0a (patch) | |
| tree | 0a26da402c204c50e001539cffc89abbe51b08b6 /icing/index/main/main-index-merger.cc | |
| parent | 030b99d2648aea03e5c2e3809a13fdfacdccde11 (diff) | |
| download | icing-29d4712b67d1ade154739e5fa9a9a7970afe6c0a.tar.gz | |
Update Icing from upstream.
Descriptions:
========================================================================
Allow adding duplicate hits with the same value into the posting list.
========================================================================
Support an extension to the encoded Hit in Icing's posting list.
========================================================================
Adds description fields to SchemaTypeConfigProto and PropertyConfigProto
========================================================================
Support polymorphism in type property filters
========================================================================
Fix posting list GetMinPostingListSizeToFit size calculation bug
========================================================================
Add instructions to error message for advanced query backward compat.
========================================================================
BUG: 294274922
BUG: 321107391
BUG: 324908653
BUG: 326987971
Change-Id: I9e8e0589a9682ee14ac34ded32b959c1ef64d84d
Diffstat (limited to 'icing/index/main/main-index-merger.cc')
| -rw-r--r-- | icing/index/main/main-index-merger.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/icing/index/main/main-index-merger.cc b/icing/index/main/main-index-merger.cc index c26a6d7..cc130c2 100644 --- a/icing/index/main/main-index-merger.cc +++ b/icing/index/main/main-index-merger.cc @@ -14,14 +14,20 @@ #include "icing/index/main/main-index-merger.h" +#include <algorithm> #include <cstdint> #include <cstring> -#include <memory> #include <unordered_map> +#include <utility> +#include <vector> +#include "icing/text_classifier/lib3/utils/base/statusor.h" #include "icing/absl_ports/canonical_errors.h" -#include "icing/file/posting_list/index-block.h" +#include "icing/file/posting_list/posting-list-common.h" +#include "icing/index/hit/hit.h" +#include "icing/index/lite/lite-index.h" #include "icing/index/lite/term-id-hit-pair.h" +#include "icing/index/main/main-index.h" #include "icing/index/term-id-codec.h" #include "icing/legacy/core/icing-string-util.h" #include "icing/util/logging.h" |