diff options
| author | Cassie Wang <cassiewang@google.com> | 2020-01-08 15:57:57 -0800 |
|---|---|---|
| committer | Cassie Wang <cassiewang@google.com> | 2020-01-09 01:53:36 +0000 |
| commit | 88a9b37a20d4a601baf3b6ca0cfb1ad826dc7e29 (patch) | |
| tree | 079657ba93902169139425fd1bb08a93c80de9c2 /icing/index/iterator/doc-hit-info-iterator-or.cc | |
| parent | 128c9db88925c8425f2ad81e1d8985461d7ba21a (diff) | |
| download | icing-88a9b37a20d4a601baf3b6ca0cfb1ad826dc7e29.tar.gz | |
Pull upstream changes and copy libtextclassifier classes.
Upstream synced @288789500.
Copied text_classifier dependencies (hash, status, logging) into icing/.
Bug: 146383629
Test: manual - ran 'm -j libicing' with a working Android.bp locally
Change-Id: I187a98af95b362745a09d605ed8334a6ff6971bb
Diffstat (limited to 'icing/index/iterator/doc-hit-info-iterator-or.cc')
| -rw-r--r-- | icing/index/iterator/doc-hit-info-iterator-or.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/icing/index/iterator/doc-hit-info-iterator-or.cc b/icing/index/iterator/doc-hit-info-iterator-or.cc index b4dc86a..9d18753 100644 --- a/icing/index/iterator/doc-hit-info-iterator-or.cc +++ b/icing/index/iterator/doc-hit-info-iterator-or.cc @@ -16,7 +16,7 @@ #include <cstdint> -#include "utils/base/status.h" +#include "icing/text_classifier/lib3/utils/base/status.h" #include "icing/absl_ports/canonical_errors.h" #include "icing/absl_ports/str_cat.h" #include "icing/index/hit/doc-hit-info.h" @@ -164,8 +164,7 @@ libtextclassifier3::Status DocHitInfoIteratorOrNary::Advance() { if (iterator->doc_hit_info().document_id() > next_document_id_max) { // Advance the iterator until its value is equal to or smaller than // next_document_id_max - if (ABSL_PREDICT_FALSE( - !AdvanceTo(iterator.get(), next_document_id_max).ok())) { + if (!AdvanceTo(iterator.get(), next_document_id_max).ok()) { continue; } } |