aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-27Fix NPE caused by handling GetFileSize return value. am: 5a0dcd8114 am: ↵android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseTim Barron
bd92098402 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18618724 Change-Id: I30b36fdaa50f0c0fe55ab2978f29d913d735414c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-27Fix NPE caused by handling GetFileSize return value. am: 5a0dcd8114Tim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18618724 Change-Id: I2e234213fbab18fe398d22d230c7d65170878b8f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26Fix NPE caused by handling GetFileSize return value.android13-devTim Barron
FileBackedVector wasn't properly checking the return value of GetFileSize when deciding whether or not it needed to grow the underlying file and remap. If GetFileSize failed due to an IO error, then FileBackedVector would conclude (incorrectly) that growing wasn't necessary and would attempt to access the mmapping at the requested index - which could result in either an NPE (if the vector was empty) or an invalid memory access (if the requested index exceeded the actual size of the mmapping). See b/232273174#comment44 for more details. This is a cherrypick of cl/451040413. Test: Builds Change-Id: I7ae0e3119126483c23a85dae3bd7a84712357209
2022-05-24Fix dangling pointer from failure in SchemaStore::RegenerateDerivedFiles. ↵Tim Barron
am: c20fd6b697 am: 4af22e0810 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18562449 Change-Id: Ice02f687ff7f5b9be7febb4431dbb2dbb3306876 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24Fix dangling pointer from failure in SchemaStore::RegenerateDerivedFiles. ↵Tim Barron
am: c20fd6b697 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18562449 Change-Id: Id58d563ecbd344f894f4b4beb895abbc3e0175a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23Fix dangling pointer from failure in SchemaStore::RegenerateDerivedFiles.Tim Barron
Essentially, SchemaStore::SetSchema would work in three steps: 1. Write the new schema 2. Throw out derived data structures 3. Regenerate the derived date structures A failure in the middle of step 3 could cause SectionManager to maintain a a reference to a now-deleted instance of KeyMapper which would then crash on the next access. This resolves that issue via shadowing to ensure that changes are only applied if everything is successfully generated. You can find the full description of the bug at b/231416401#comment10. This is a cherrypick of cl/449537037 and cl/450024848. The changes in cl/449849170 (and replaced with direct calls to delete the temp directories) were excluded to keep the size of cherrypick smaller. Test: Builds Change-Id: Ic018ade45b5aab4b797a0a654eaea6ac424469ab
2022-05-14Fix NPE bug caused by a failed Remap. am: 574b723a7e am: 971f75795fTim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18385601 Change-Id: If128f36f1cffe24f5d55cb1980030d510b8d80c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14Fix NPE bug caused by a failed Remap. am: 574b723a7eTim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18385601 Change-Id: Ia4fd4d2176946b29c04da5cb88f26f20bc5c6051 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14Fix NPE bug caused by a failed Remap.Tim Barron
Cherrypick a change that fixes an error in MemoryMappedFile::Remap. Essentially, that error meant that a previously valid mapping could become invalid if Remap were to fail. This is a cherrypick of cl/448387045. Bug: 232273174 Test: builds Change-Id: If794d820583dad347edc319ca72cc8ecf773a100
2022-05-12Merge "Stop dropping nonascii/nonalnum segments." into tm-dev am: 34f7ab9226 ↵Tim Barron
am: 8c72386649 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18328740 Change-Id: I41a3f5bd90f63cf98493b45ae6894f80c2e21569 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge "Stop dropping nonascii/nonalnum segments." into tm-dev am: 34f7ab9226Tim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18328740 Change-Id: Iaf68a7b903f52f049a53bfffb4128952b6d57c7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Merge "Stop dropping nonascii/nonalnum segments." into tm-devTim Barron
2022-05-12Fix bug overriding nested incompatible types. am: 5fa917ce71 am: fcdd044339Tim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18328263 Change-Id: Id8da67180236242f4f7a8e5133a4de576f14dabf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12Fix bug overriding nested incompatible types. am: 5fa917ce71Tim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/18328263 Change-Id: I5f70f644de05fcef56f878a06b964357cc70973b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11Stop dropping nonascii/nonalnum segments.Tim Barron
Cherrypick a change that would remove the existing behavior of the LanguageSegmenter to filer out non-ascii+non-alphanumeric segments. This behavior is more appropriate for a higher level class like the tokenizer. This will allow a consistent hanlding: punctuation and whitespace is not indexed. All other segments are. This is a cherrypick of cl/446831054. Bug: 229770338 Test: builds Change-Id: Id6056354aaea5fca1cdb0e9300065bd3f91e401b
2022-05-11Fix bug overriding nested incompatible types.Tim Barron
Cherrypick a bug fix that would cause SetSchema to fail even with override=true, if a client made an incompatible change to a type that is nested in a newly added type. This is a cherrypick of cl/447787757. Bug: 230879098 Test: builds Change-Id: If8ee54f903f450d938a856d87110fb333aeecb09
2022-04-26Fix for memory leaks. am: fbf0cddf25 am: d61db63d39Christopher Ferris
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/17902806 Change-Id: I26cd29941e6c46f96d5682c81ca64c2ae80e6f07 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26Fix for memory leaks. am: fbf0cddf25Christopher Ferris
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/17902806 Change-Id: Ifaa2eb27942332824c34dc1ae41641004e3a3bf4 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21Fix for memory leaks.Christopher Ferris
Bug: 230049434 Test: No more leaks. Change-Id: I0b694c3c1accba109ee18f260da98a0850b8f949
2022-03-28Switch libicing to depend on libicu.Tim Barron
Bug: 223549255 Test: atest --rebuild-module-info CtsAppSearchTestCases Change-Id: I8747c37b51dd46c2f756a99abb854e3a3d3dab02
2022-03-23Merge remote-tracking branch 'goog/androidx-platform-dev' into tm-devAlexander Dorokhine
* goog/androidx-platform-dev: Sync from upstream. Sync from upstream. Sync from upstream. Descriptions: ====================================================================== Add some additional logging that will help diagnose b/218413237 ====================================================================== Mark VerbatimTokenizer::ResetToTokenStartingAfter as 'override'. ====================================================================== Support dump function for SchemaStore ====================================================================== Refactor DocumentStore::Initialize to improve readability of document store recovery. ====================================================================== Remove non-NDK API usages of ICU4C in libicing. ====================================================================== Move IcuDataFileHelper to the testing directory since it is a test-only util. ====================================================================== Support dump function for DocumentStore ====================================================================== Switch to use PRead rather than MMap in the proto log. ====================================================================== Support dump function for main/lite index and lexicon ====================================================================== Fix LiteIndex::AppendHits ====================================================================== Enable and fix DocumentStoreTest.LoadScoreCacheAndInitializeSuccessfully ====================================================================== Fix MainIndex::GetStorageInfo. ====================================================================== Fix icing-search-engine_fuzz_test by making IcuLanguageSegmenterIterator::Advance non-recursive. ====================================================================== Allow to return additional information for deleted documents in DeleteByQuery ====================================================================== Using enum class in Token::Type for better type safety. ====================================================================== Normalize Tokens by Token type when retrieving snippets ================ Rename max_window_bytes to max_window_utf32_length, Delete the max_tokens_per_doc field in IcingSearchEngineOptions. ================ Handle suggestion namespace ownership. ================ Fix OkStatus() is not a valid argument to StatusOr in Main_index.RetrieveMoreHits. ================ Allow advancing when current indices are negative in CharacterIterator ================ Adds support for verbatim tokenization and indexing in IcingLib ================ Renames TokenizerIterator Reset functions ================ Add term_match_type to SuggestionSpec proto ================ Unify the C++ proto enum style ================ Allow zero property weights in IcingLib Bug: 152934343 Bug: 158089703 Bug: 185845269 Bug: 203700301 Bug: 204333391 Bug: 205209589 Bug: 206147728 Bug: 209071710 Bug: 209993976 Bug: 218413237 Bug: 218413237 Bug: 223549255 Test: Presubmit Change-Id: I96665ba718f89e69ca99cd833ad80fa555edf436
2022-03-21Merge remote-tracking branch 'goog/upstream-master' into libicuTim Barron
* goog/upstream-master: Sync from upstream. Sync from upstream. Sync from upstream. Descriptions: ====================================================================== Add some additional logging that will help diagnose b/218413237 ====================================================================== Mark VerbatimTokenizer::ResetToTokenStartingAfter as 'override'. ====================================================================== Support dump function for SchemaStore ====================================================================== Refactor DocumentStore::Initialize to improve readability of document store recovery. ====================================================================== Remove non-NDK API usages of ICU4C in libicing. ====================================================================== Move IcuDataFileHelper to the testing directory since it is a test-only util. ====================================================================== Support dump function for DocumentStore ====================================================================== Switch to use PRead rather than MMap in the proto log. ====================================================================== Support dump function for main/lite index and lexicon ====================================================================== Fix LiteIndex::AppendHits ====================================================================== Enable and fix DocumentStoreTest.LoadScoreCacheAndInitializeSuccessfully ====================================================================== Fix MainIndex::GetStorageInfo. ====================================================================== Fix icing-search-engine_fuzz_test by making IcuLanguageSegmenterIterator::Advance non-recursive. ====================================================================== Allow to return additional information for deleted documents in DeleteByQuery ====================================================================== Using enum class in Token::Type for better type safety. ====================================================================== Normalize Tokens by Token type when retrieving snippets ================ Rename max_window_bytes to max_window_utf32_length, Delete the max_tokens_per_doc field in IcingSearchEngineOptions. ================ Handle suggestion namespace ownership. ================ Fix OkStatus() is not a valid argument to StatusOr in Main_index.RetrieveMoreHits. ================ Allow advancing when current indices are negative in CharacterIterator ================ Adds support for verbatim tokenization and indexing in IcingLib ================ Renames TokenizerIterator Reset functions ================ Add term_match_type to SuggestionSpec proto ================ Unify the C++ proto enum style ================ Allow zero property weights in IcingLib ================ 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. ================ Implement ranking in FindTermByPrefix. ================ Fork proto's GzipStream into Icing Lib. ================ Remove token limit behavior from index-processor. ================ 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. ================== 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: 147509515 Bug: 149610413 Bug: 152934343 Bug: 158089703 Bug: 185845269 Bug: 195720764 Bug: 196257995 Bug: 196771754 Bug: 202308641 Bug: 203700301 Bug: 204333391 Bug: 205209589 Bug: 206147728 Bug: 209071710 Bug: 209993976 Bug: 218413237 Bug: 223549255 Test: ./gradlew appsearch:appsearch:connectedCheck appsearch:appsearch-local-storage:connectedCheck appsearch:appsearch-platform-storage:connectedCheck Change-Id: I66c8d78b99ced978feaea3459ccff0cf5b22ff27
2022-03-21Sync from upstream.Tim Barron
Descriptions: ====================================================================== Add some additional logging that will help diagnose b/218413237 ====================================================================== Mark VerbatimTokenizer::ResetToTokenStartingAfter as 'override'. ====================================================================== Support dump function for SchemaStore ====================================================================== Bug: 218413237 Change-Id: I8554dc14b9e9b5aec56e4e9a3b3aa07c0e7d0f1b
2022-03-19Add icing to hwasan-postsubmit am: 37a87538c1 am: c6b7b34736 am: 90f9657024Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2032711 Change-Id: Icca643f192e607083f4c6a0342287d6807d3829c
2022-03-19Add icing to hwasan-postsubmit am: 37a87538c1 am: c6b7b34736Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2032711 Change-Id: Id481a4b83694d5dce2397779072ee91ff5a1a2dc
2022-03-19Add icing to hwasan-postsubmit am: 37a87538c1Florian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2032711 Change-Id: I56ed9e691ba86d3e8a0675a0cef1150e1eab4b30
2022-03-18Add icing to hwasan-postsubmitFlorian Mayer
Test: Run tests under HWASan. Bug: 193568145 Change-Id: I9962cc83c3e247d0030029122777b60492b93d25
2022-03-17Sync from upstream.Tim Barron
This sync simply re-runs the sync from ag/17226641, but with a fix in the export script that will prevent proto/icing/query/list_filter/syntax.proto from being exported. Change-Id: Iffbb68b6be93410350859ebeae4737518804ae7f
2022-03-16Sync from upstream.Tim Barron
This sync will bring goog/upstream-master into agreement with aosp/upstream-master. Unfortunately merging any permutation of aosp/upstream-master or androidx-main into goog/upstream-master or androidx-platform-dev isn't doable because I don't own some of the commits in the chain. Descriptions: ====================================================================== Refactor DocumentStore::Initialize to improve readability of document store recovery. ====================================================================== Remove non-NDK API usages of ICU4C in libicing. ====================================================================== Move IcuDataFileHelper to the testing directory since it is a test-only util. ====================================================================== Support dump function for DocumentStore ====================================================================== Switch to use PRead rather than MMap in the proto log. ====================================================================== Support dump function for main/lite index and lexicon ====================================================================== Fix LiteIndex::AppendHits ====================================================================== Enable and fix DocumentStoreTest.LoadScoreCacheAndInitializeSuccessfully ====================================================================== Fix MainIndex::GetStorageInfo. ====================================================================== Fix icing-search-engine_fuzz_test by making IcuLanguageSegmenterIterator::Advance non-recursive. ====================================================================== Allow to return additional information for deleted documents in DeleteByQuery ====================================================================== Using enum class in Token::Type for better type safety. ====================================================================== Normalize Tokens by Token type when retrieving snippets ================ Rename max_window_bytes to max_window_utf32_length, Delete the max_tokens_per_doc field in IcingSearchEngineOptions. ================ Handle suggestion namespace ownership. ================ Fix OkStatus() is not a valid argument to StatusOr in Main_index.RetrieveMoreHits. ================ Allow advancing when current indices are negative in CharacterIterator ================ Adds support for verbatim tokenization and indexing in IcingLib ================ Renames TokenizerIterator Reset functions ================ Add term_match_type to SuggestionSpec proto ================ Unify the C++ proto enum style ================ Allow zero property weights in IcingLib ================ 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. ================ Implement ranking in FindTermByPrefix. ================ Fork proto's GzipStream into Icing Lib. ================ Remove token limit behavior from index-processor. ================ 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. ================== 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: 147509515 Bug: 149610413 Bug: 152934343 Bug: 158089703 Bug: 185845269 Bug: 195720764 Bug: 196257995 Bug: 196771754 Bug: 202308641 Bug: 203700301 Bug: 204333391 Bug: 205209589 Bug: 206147728 Bug: 209071710 Bug: 209993976 Bug: 218413237 Bug: 223549255 Change-Id: I87c5da3a80463d62b8d24e8ff8a9a91952d3fc64
2022-03-09Merge "Add min_sdk_version rules to allow building as an updatable apex." ↵Alexander Dorokhine
into tm-dev
2022-03-09[automerger skipped] Merge Android 12L am: 06579f2cab -s ours am: a7c1b071f0 ↵Xin Li
-s ours am: afc9df24bf -s ours am skip reason: Merged-In I900e032bc567fc6d2056e213bf4ffb97b87548fb with SHA-1 72ba6d64ec is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2012794 Change-Id: I8ba008078cbc4e98c21f35ecefeed6ec595a51e5
2022-03-08[automerger skipped] Merge Android 12L am: 06579f2cab -s ours am: a7c1b071f0 ↵Xin Li
-s ours am skip reason: Merged-In I900e032bc567fc6d2056e213bf4ffb97b87548fb with SHA-1 72ba6d64ec is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2012794 Change-Id: If17f4226056483aa2c20de4e5b226d36bdc0c5d3
2022-03-08[automerger skipped] Merge Android 12L am: 06579f2cab -s oursXin Li
am skip reason: Merged-In I900e032bc567fc6d2056e213bf4ffb97b87548fb with SHA-1 72ba6d64ec is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2012794 Change-Id: I74bb12209273b15166c3f609fbb46ab9e8a7f54b
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I900e032bc567fc6d2056e213bf4ffb97b87548fb Change-Id: I19c7139859596d5375c67e8e383118ebf123b4af
2022-03-03Add min_sdk_version rules to allow building as an updatable apex.Alexander Dorokhine
Bug: 218419277 Test: Builds; passes CTS tests Change-Id: I385937777f903a4fcac8e2509b401378cc7f5fa2
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
72ba6d64ec -s ours am: 9fc36f1cc5 -s ours am skip reason: Merged-In I1f2599847db38e6c283c81b678616b416c47688c with SHA-1 ef62615dfe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/16845167 Change-Id: Ibcd8943e1f34b7cbd595c3710daa436817dc72b4
2022-02-14[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: ↵Xin Li
72ba6d64ec -s ours am skip reason: Merged-In I1f2599847db38e6c283c81b678616b416c47688c with SHA-1 ef62615dfe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/16845167 Change-Id: Id412285ff7f515e8f9418051b046069ecff89f98
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891sam_222710654Xin Li
Bug: 214455710 Merged-In: I1f2599847db38e6c283c81b678616b416c47688c Change-Id: I900e032bc567fc6d2056e213bf4ffb97b87548fb
2021-11-11Link libicing against libprotobuf-cpp-lite instead of full.Alexander Dorokhine
The work required to remove icing lib's usage of features shipped only in libprotobuf-cpp-full has already been submitted. Bug: 147509515 Test: CtsAppSearchTestCases Change-Id: Idd5b0c10231b7706b303efaaebf1a0bb30b44311
2021-11-05Merge remote-tracking branch 'goog/androidx-platform-dev' into masterAlexander Dorokhine
* goog/androidx-platform-dev: Sync from upstream. Sync from upstream. Add an OWNERS file for external/icing. Sync from upstream. Sync from upstream. Merge androidx-platform-dev/external/icing upstream-master into upstream-master Sync from upstream. Sync from upstream. Commit 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. ================== 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. ================ Implement ranking in FindTermByPrefix. ================ Fork proto's GzipStream into Icing Lib. ================ Remove token limit behavior from index-processor. ================ 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: 147509515 Bug: 149610413 Bug: 152934343 Bug: 195720764 Bug: 196257995 Bug: 196771754 Bug: 202308641 Bug: 203700301 Test: Presubmit Change-Id: I31e39a3e5fe5ecccafadf34ef72a7442902bc0cd
2021-10-29Merge "Merge remote-tracking branch 'aosp/upstream-master' into ↵Treehugger Robot
androidx-main" into androidx-main am: 8f16167c39 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1874071 Change-Id: I28b130b82b61861225dddd4fc958d1758dce839f
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-28Remove redundant getDependencyAsString am: 2776967dbcAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/1874053 Change-Id: Ifb2a61978f0e2d3b619c3e60f33d591870bd0a4e
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-13Merge "Revert "Revert "Update TEST_MAPPING to account for moved AppSear...""Alexander Dorokhine
2021-10-11Revert "Revert "Update TEST_MAPPING to account for moved AppSear..."Alexander Dorokhine
Revert submission 16034867-revert-16010691-015-fix-coretests-like-head-VIFTTINGIH Reason for revert: Rollforward with ag/16010934 Reverted Changes: Ibe4f3edb3:Revert "Update TEST_MAPPING to account for moved A... I89a5014f1:Revert "Get AppSearch coretests building and passi... Change-Id: I96b01d9d9ecdbdd6f07578e7216fb5130564d2f9
2021-10-11Merge "Revert "Update TEST_MAPPING to account for moved AppSearch code.""Christine Tsai
2021-10-11Revert "Update TEST_MAPPING to account for moved AppSearch code."Christine Tsai
Revert submission 16010691-015-fix-coretests-like-head Reason for revert: Build breakage Reverted Changes: I929b59942:Get AppSearch coretests building and passing again... I3382ae3bc:Update TEST_MAPPING to account for moved AppSearch... Change-Id: Ibe4f3edb3e54bcfe744499beee0d67fbee00d38f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 05:07:49 +0000