diff options
| author | Terry Wang <tytytyww@google.com> | 2023-03-03 15:25:31 -0800 |
|---|---|---|
| committer | Terry Wang <tytytyww@google.com> | 2023-03-03 23:27:31 +0000 |
| commit | 57993fa372564b1cc1310aa094da188efa76c7fa (patch) | |
| tree | b9c55efbbc3c44ab8a0f3ebc4eb9fb2e95c60ab7 /icing/join/doc-join-info.cc | |
| parent | 3f1a0c3d1aed4c5f9dc8b7581247dad85dec6683 (diff) | |
| parent | 49064c458678781fbf3db256751658728dc87740 (diff) | |
| download | icing-57993fa372564b1cc1310aa094da188efa76c7fa.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-dev
* goog/upstream-master:
Update Icing from upstream.
Descriptions:
======================================================================
Modify the lexer to consider internal minus characters to be a part of TEXT segments (as hyphens).
======================================================================
Modify the query language to support an individual prefix operator '*'.
======================================================================
Fix the fingerprint issue for document key mapper in document store
======================================================================
Resolve issues around the handling of negative numbers.
======================================================================
Fix doc join info compiler warning/error
======================================================================
Codifies how colons are tokenized by the lexer
Bug: 208654892
Bug: 268680462
Change-Id: I08d95f9058d5642e66ef4805a5599de41d2bbcfc
Diffstat (limited to 'icing/join/doc-join-info.cc')
| -rw-r--r-- | icing/join/doc-join-info.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/icing/join/doc-join-info.cc b/icing/join/doc-join-info.cc index 9bef08a..3b06f01 100644 --- a/icing/join/doc-join-info.cc +++ b/icing/join/doc-join-info.cc @@ -25,13 +25,14 @@ namespace lib { DocJoinInfo::DocJoinInfo(DocumentId document_id, JoinablePropertyId joinable_property_id) { - value_ = 0; + Value temp_value = 0; bit_util::BitfieldSet(/*new_value=*/document_id, /*lsb_offset=*/kJoinablePropertyIdBits, - /*len=*/kDocumentIdBits, &value_); + /*len=*/kDocumentIdBits, &temp_value); bit_util::BitfieldSet(/*new_value=*/joinable_property_id, /*lsb_offset=*/0, - /*len=*/kJoinablePropertyIdBits, &value_); + /*len=*/kJoinablePropertyIdBits, &temp_value); + value_ = temp_value; } DocumentId DocJoinInfo::document_id() const { |