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-and.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-and.cc')
| -rw-r--r-- | icing/index/iterator/doc-hit-info-iterator-and.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/icing/index/iterator/doc-hit-info-iterator-and.cc b/icing/index/iterator/doc-hit-info-iterator-and.cc index 276b78a..636b557 100644 --- a/icing/index/iterator/doc-hit-info-iterator-and.cc +++ b/icing/index/iterator/doc-hit-info-iterator-and.cc @@ -22,7 +22,7 @@ #include <utility> #include <vector> -#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/status_macros.h" #include "icing/absl_ports/str_cat.h" @@ -92,16 +92,16 @@ libtextclassifier3::Status DocHitInfoIteratorAnd::Advance() { DocumentId short_doc_id = short_->doc_hit_info().document_id(); // Then AdvanceTo on long - ICING_ASSIGN_OR_RETURN(DocumentId long_doc_id, + TC3_ASSIGN_OR_RETURN(DocumentId long_doc_id, AdvanceTo(long_.get(), short_doc_id)); // Now try to align DocHitInfos by moving one or the other. while (short_doc_id != long_doc_id) { if (short_doc_id > long_doc_id) { - ICING_ASSIGN_OR_RETURN(short_doc_id, + TC3_ASSIGN_OR_RETURN(short_doc_id, AdvanceTo(short_.get(), long_doc_id)); } else { - ICING_ASSIGN_OR_RETURN(long_doc_id, AdvanceTo(long_.get(), short_doc_id)); + TC3_ASSIGN_OR_RETURN(long_doc_id, AdvanceTo(long_.get(), short_doc_id)); } } @@ -162,7 +162,7 @@ libtextclassifier3::Status DocHitInfoIteratorAndNary::Advance() { // Advance the current iterator until it's equal to or smaller than the // potential hit doc id DocumentId unused; - ICING_ASSIGN_OR_RETURN( + TC3_ASSIGN_OR_RETURN( unused, AdvanceTo(iterator.get(), potential_document_id)); } |