aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-10-29Merge "Merge remote-tracking branch 'aosp/upstream-master' into ↵androidx-preference-releaseandroidx-metrics-releaseandroidx-localbroadcastmanager-releaseandroidx-draganddrop-releaseandroidx-customview-customview-poolingcontainer-releaseandroidx-core-core-splashscreen-releaseandroidx-coordinatorlayout-releaseTreehugger Robot
androidx-main" into androidx-main
2021-10-28Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainTim Barron
* aosp/upstream-master: Sync from upstream. Descriptions: ================ Replace refs to c lib headers w/ c++ stdlib equivalents. ================ Update IDF component of BM25F Calculator in IcingLib ================ Expose QuerySuggestions API. ================ Change the tokenizer used in QuerySuggest. ================ Add SectionWeights API to Icing. ================ Apply SectionWeights to BM25F Scoring. ================ Replaces uses of u_strTo/FromUTF32 w/ u_strTo/FromUTF8. Bug: 152934343 Bug: 202308641 Bug: 203700301 Change-Id: Ic3e9cadac7532d54f0b16b56e75f8387f92d4dc4
2021-10-28Remove redundant getDependencyAsStringAurimas Liutikas
toString now works correctly in Gradle and this method is no longer needed. Test: ./gradlew tasks Change-Id: I3f5126aa96e69e8a6682b2d2ae8bd3a114400227
2021-10-21Sync from upstream.Tim Barron
Descriptions: ================ Replace refs to c lib headers w/ c++ stdlib equivalents. ================ Update IDF component of BM25F Calculator in IcingLib ================ Expose QuerySuggestions API. ================ Change the tokenizer used in QuerySuggest. ================ Add SectionWeights API to Icing. ================ Apply SectionWeights to BM25F Scoring. ================ Replaces uses of u_strTo/FromUTF32 w/ u_strTo/FromUTF8. Bug: 152934343 Bug: 202308641 Bug: 203700301 Change-Id: Ic884a84e5ff4c9c04b2cd6dd1fce90765aa4446e
2021-10-07Add project name to CMakeLists.txtFred Sladkey
Change-Id: I27c8e6a8c3521136569daeab1f6f0cba60302783
2021-09-22Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainandroidx-resourceinspection-releaseAlexander Dorokhine
* aosp/upstream-master: Remove non-upstream files from upstream-master. Change-Id: I829c34d62826497d910992e31a3e9a5c155ed452
2021-09-21Remove non-upstream files from upstream-master.Alexander Dorokhine
These files should exist only on the development branches. Change-Id: I0ee7d5d0729de6f09cd3f782b99caea1fe9a9916
2021-09-20Build libicing against libprotobuf-cpp-lite.Alexander Dorokhine
This allows for a smaller binary (2.4M -> 1.6M libicing.so arm64). Bug: 147509515 Test: Build; connectedCheck Change-Id: I03c10f0ab0bc7a36fa886b18cfe4b8bb7e9c9e78
2021-09-13Merge remote-tracking branch 'aosp/upstream-master' into HEADTim Barron
* aosp/upstream-master: Sync from upstream. Add an OWNERS file for external/icing. Sync from upstream. Descriptions: ================ Implement ranking in FindTermByPrefix. ================ Fork proto's GzipStream into Icing Lib. ================ Remove token limit behavior from index-processor. ================ Bug: 152934343 Bug: 147509515 Bug: 196771754 Change-Id: Ic64eccae52221a4be9635722641ecf2e33dd1f13
2021-09-13Sync from upstream.Tim Barron
Descriptions: ================ Implement ranking in FindTermByPrefix. ================ Fork proto's GzipStream into Icing Lib. ================ Remove token limit behavior from index-processor. ================ Bug: 152934343 Bug: 147509515 Bug: 196771754 Change-Id: I7f95392afc97001df0ae3f60720743c74d64ba84
2021-09-13Add an OWNERS file for external/icing.Dan Saadati
Change-Id: I4da0e2a4b425fce8116d40baed8fdcd0b217dbd1
2021-09-09Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainMy Name
* aosp/upstream-master: Sync from upstream. Descriptions: ================ Remove no-longer-used write paths for file-backed-proto-log. ================ Modify segmentation rules to consider any segment that begins with a non-Ascii alphanumeric character as valid ================= Implement CalculateNormalizedMatchLength for IcuNormalizer. ================ Add additional benchmark cases that were useful in developing submatching and CalculateNormalizedMatchLength for IcuNormalizer ================= Switch NormalizationMap from static const std::unordered_map<char16_t, char16_t>& to static const std::unordered_map<char16_t, char16_t> *const. ================== Bug: 147509515 Bug: 149610413 Bug: 195720764 Bug: 196257995 Change-Id: I8e8d7a7fcceb8eaae1fdcb45a92ea4399d47f343
2021-09-08Sync from upstream.My Name
Descriptions: ================ Remove no-longer-used write paths for file-backed-proto-log. ================ Modify segmentation rules to consider any segment that begins with a non-Ascii alphanumeric character as valid ================= Implement CalculateNormalizedMatchLength for IcuNormalizer. ================ Add additional benchmark cases that were useful in developing submatching and CalculateNormalizedMatchLength for IcuNormalizer ================= Switch NormalizationMap from static const std::unordered_map<char16_t, char16_t>& to static const std::unordered_map<char16_t, char16_t> *const. ================== Bug: 147509515 Bug: 149610413 Bug: 195720764 Bug: 196257995 Change-Id: Iabdb34a983b5d47daca808888a46c241767d93bf
2021-08-13Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainTim Barron
* aosp/upstream-master: Sync from upstream. Descriptions: ================== Add Initialization Count marker file to break out of crash loops. ================== Delete the Simple Normalizer. ================== Add submatch information to identify a submatch within a document. ================== Bug: 195720764 Change-Id: I12500fdc0e852b81a623e54e9991ac8414f0a770
2021-08-13Sync from upstream.Tim Barron
Descriptions: ================== Add Initialization Count marker file to break out of crash loops. ================== Delete the Simple Normalizer. ================== Add submatch information to identify a submatch within a document. ================== Bug: 195720764 Change-Id: I27bcc66c400da625d595609049d281b809dd6028
2021-08-13Merge branch 'upstream-master' into androidx-mainAlexander Dorokhine
Change-Id: Ia5c58c303706de2454d3fea44de075d0f6e02bcd
2021-08-13Merge androidx-platform-dev/external/icing upstream-master into upstream-masterAlexander Dorokhine
Change-Id: Id39bea14b3a3d378d722dc552e4f3bd4249f3f94
2021-08-10Merge remote-tracking branch 'aosp/androidx-platform-dev-temp' into ↵Alan Viverette
191673756_upstream_platform Bug: 191673756 Test: ./gradlew bOS Change-Id: I0642f893bdc1b2b6fdf75b05aba2fd37bdf5c6f4
2021-07-20Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devCassie Wang
* goog/upstream-master: Sync from upstream. Sync from upstream. Includes ag/15291302 and ag/15329694 Change-Id: I90c45c6f61975b6a8d2df2183de8f304b54e3251
2021-07-19Sync from upstream.Cassie Wang
Descriptions: ================== Switch to PRId64 string formatting. ================== Conditionally recompute the checksum for PortableFileBackedProtoLog. ================== Fix spammy error log encountered in hit iterator. =================== Fix -Wunused-but-set-variable warnings Bug: 193141896 Change-Id: I46ca2daa90efe442e9ebeac389e91df21ddc81d6
2021-07-14Sync from upstream.Cassie Wang
Descriptions: ============ Lower the memory usage cap from 16MB to 4MB. ============ Modify file-backed-vector to 1) include a check that the size of the file is greater than or equal to the number of elements * sizeof(element) and 2) use PWrite to force the system to allocate disk blocks so that we avoid the risk of trying to mmap a region of the file that the system hasn't allocated a block for (and is unable to do so). ============ Fix unused-error and reorder-ctor issues that surfaced in framework ============ Bug: 191444782 Bug: 193715176 Change-Id: Ic76a46700e770b6740a69c4777f88639c8c4e946
2021-06-30Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devCassie Wang
* goog/upstream-master: Sync from upstream Change-Id: If757496e9cfbd1dc9724bfa46902f4d009745e31
2021-06-30Sync from upstreamCassie Wang
Descriptions: ============== Enforce kMaxDocumentId when inserting new documents. ============== Resets members before reinitializing in IcingSearchEngine Reset() ============== Exclude a data files for tests under the icing/testdata directory. Bug: 192464981 Change-Id: I1f8855550791a93022068ea78b6cba2a0758bfb1
2021-06-30Move to using version catalogs for protobuf in icing. am: bbbb1f6b78Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1752660 Change-Id: Id1340c8d127bcf0966fae323e71791514b132184
2021-06-30Move to using version catalogs for protobuf in icing.androidx-wear-wear-ongoing-releaseAurimas Liutikas
Test: ./gradlew tasks Change-Id: I44588c60b2c64c97f20b1cbe56ed3cda24f5a5e9
2021-06-25Merge "Delete testdata files from external/icing" into androidx-platform-devTim Barron
2021-06-24Enable IcingSearchEngineTest#testCJKTSnippetsTim Barron
The fix for this test has been synced in from ag/15083267 [I0778164b75e1552451290f1b8fe4a0e07b3dc844] Bug: 190845688 Test: IcingSearchEngineTest Change-Id: I75ae1898c3e5ca8df00c129aa22b1284d32d2fc0
2021-06-24Delete testdata files from external/icingTim Barron
This files are only used to run a migration test case in DocumentStoreTest. Change-Id: I5eeecd4f9942cf29dda981e0bcab537ff43807fc
2021-06-24Migrate to using Gradle version catalogs am: 65982dc677Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1744624 Change-Id: If3a5550e6019c9760c5e19ee411ec5ec24f00e36
2021-06-23Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devTim Barron
* goog/upstream-master: Sync from upstream. Change-Id: I0778164b75e1552451290f1b8fe4a0e07b3dc844
2021-06-23Sync from upstream.Tim Barron
Descriptions: ========== Switch DocumentStore to using PortableFileBackedProtoLog instead of FileBackedProtoLog, and migrate any existing FileBackedProtoLog's to the Portable* version. ========== Add more fields to SchemaStats to capture the types that were newly added, modified and modified with an index rebuild. ========== Create a new DeleteByQueryStatsProto to capture query-specific stats related to the performance of DeleteByQuery. ========== Fix bugs in SetSchema: 1. Property id reassignments when a property is deleted and a new one added was not being detected 2. Property id reassignments due to changes to the index_nested_properties field were not detected. 3. Backward incompatible changes should invalidate dependent types. ========== Fix IcingSearchEngineTest.CJKSnippets test by choosing a simpler multi-byte character (when encoded in UTF-8) string that ICU will always segment in the same way regardless of api level. Bug: 185806837 Bug: 187205195 Bug: 187726282 Change-Id: I07cc8bf3fc5b3a7c5e8f0d24d1724297f3bfba5d
2021-06-23Migrate to using Gradle version catalogsAurimas Liutikas
Test: ./gradlew tasks -> no changes Change-Id: I0c318a86e0e96941304e111141fa6a8878a203f8
2021-06-17Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devTim Barron
* goog/upstream-master: Sync from upstream. Change-Id: I85b373c56933f2525e3ff928484da874b299d831
2021-06-16Sync from upstream.Tim Barron
Descriptions: ========== Add a dirty bit flag to document store to avoid checksumming during initialization. ========== Change the interpretation of snippet window size to be measured in unicode characters rather than bytes. ========== Implement snippet window shifting to more closely match the requested size. ========== Make GetDocumentFilterData check if a document exists first, and if not, return NOT_FOUND. ========== Move reverse-jni-break-iterator to the tokenization/reverse_jni directory. Bug: 185806837 Bug: 188826120 Bug: 188914218 Change-Id: I908e4b5eedc85332a318ce0e5b891a7a950720db
2021-06-11@Ignore IcingSearchEngineTest#testCJKTSnippetsEmber Rose
Test: N/A Bug: 190845688 Change-Id: I6bc54a68ce8b6b3d9b4c14b91f05a2ebb7a08b41
2021-06-08Compile libicing.so with a version script.Tim Barron
This will make it easier for the linker to eliminate dead code. Change-Id: I9c26f27fe585453e10585546ef1ce1d8602eea93
2021-06-02Add explicit dependency between proto and AGP tasks am: 39ba960dd3Aurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1724031 Change-Id: I35c078f60dda8361cf59c2e6d91e8296a03428b8
2021-06-01Add explicit dependency between proto and AGP tasksAurimas Liutikas
Test: treehugger Change-Id: I086054a50ebfddd2194d88b1fac902693a328e79
2021-05-25Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devCassie Wang
* goog/upstream-master: Pull upstream changes. Bug: 185804696 Bug: 189136429 Bug: 187879464 Change-Id: I1680bce0f190933579ff54d386f99255c8ac443a
2021-05-25Pull upstream changes.Cassie Wang
Descriptions: ========== Create a portable file backed proto log ========== Fix bug that was causing us to not update the last_added_document_id of the index ========== Remove dependency on icu dat file. ========== Create a simple dump utility that dumps all schemas, namespaces and documents. ========== Fix usage score handling for nonexistent documents. ========== Allow querying in dumper.cc. ========== Fix bit-util to actually set fields. ========== Bug: 185804696 Bug: 189136429 Bug: 187879464 Change-Id: I7a8f7b223884a647dc0fe4d70de99d586a6b6e33
2021-05-11Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devCassie Wang
* goog/upstream-master: Sync from upstream. Change-Id: I59c5686429289baaddf90ed25b3394fe79849580
2021-05-11Sync from upstream.Cassie Wang
Descriptions: ========== Fix our call to Delete() when Put()-ing. ========== Change-Id: I044cc75b99771c07e3f2222a621c2681b5b44957
2021-05-07Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devTim Barron
* goog/upstream-master: Sync from upstream. Change-Id: I9f2e45c0b2438c91aacb9ebc32c6176deadfb808
2021-05-07Sync from upstream.Tim Barron
Descriptions: ========== [b/185445694] Return snippetting information as both byte indices and unicode character indices. ========== [b/185804696] Copy over endian logic to handle ntoh* and hton* conversions. ========== [b/185822483] Rewrite DoesDocumentExist to avoid constructing Status objects and error messages. ========== Change-Id: I64767fb975acc49ee15822d676c87bcafb4a8b4d
2021-05-06Merge "Sync icing CMake file with icu cmake changes" into androidx-platform-devTim Barron
2021-04-28Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devTim Barron
* goog/upstream-master: Sync from upstream. Change-Id: I6553b44dff05c97febf7ffd4ce567db93380e491
2021-04-28Sync from upstream.Tim Barron
Descriptions: ========== Delete soft delete code. This code is unused and can never be used per PWG policy. ========== Replace the overall checksum with a marker file. ========== Switch FileBackedProtoLog ComputeChecksum to mmap the entire section (on 64-bit devices) or in 4MB chunks (on 32-bit devices) ========== Adjust snippet max_window_bytes to include a window if the max_window_bytes is the exact length of the query match as well. ========== Scale last time usage scorers to return score in milliseconds ========== Remove includes of *.proto.h files. ========== Add query length to IcingQueryStats ========== Change-Id: I4bb375cb5ceec475dec62680fb9da026aed6f032
2021-04-21Sync icing CMake file with icu cmake changesTim Barron
Change-Id: Ie19fc29103618ed441f8b32ce22d76a974f61cbb
2021-04-19Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-devTerry Wang
* goog/upstream-master: Sync from upstream. Change-Id: Ibc29f55a71dcc0bf91c74a9e3649626ba903270f
2021-04-16Sync from upstream.Terry Wang
Descriptions: ============ Make IcingSearchEngine to be non-Final so that it can be mocked in AppSearch Change-Id: I004fe8556c379e7041c1390ffe08a7539b4e25a3