aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I9f448463ecaae2b44ce31833a90d9672c33907b1 Change-Id: I986936f038c20a9b2579d658eea5176ede545011
2023-12-05[automerger skipped] Merge remote-tracking branch ↵Terry Wang
'goog/androidx-platform-dev' am: d33a748e3f -s ours am skip reason: Merged-In I957abd9da83e30106dac188677415bd68f64185b with SHA-1 4c2d0f8f4b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/25548352 Change-Id: I674b44a183f7ee5bad0f1d5790acc8513c5680da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge remote-tracking branch 'goog/androidx-platform-dev'Terry Wang
* goog/androidx-platform-dev: Update Icing from upstream. Update Icing from upstream. Update Icing from upstream. Descriptions: ======================================================================== Add @UsedByNative annotations to native* methods in IcingSearchEngineImpl. ======================================================================== [Icing][version 3] Bump kVersion to 3 ======================================================================== Make lite index magic dependent on `IcingSearchEngineOptions::build_property_existence_metadata_hits` ======================================================================== Add a flag in IcingSearchEngineOptions to control whether to build property existence metadata hits ======================================================================== Support `hasProperty(property_path)` in the advanced query language ======================================================================== Add PropertyExistenceIndexingHandler to index property existence metadata hit ======================================================================== [JoinIndex Improvement][11/x] Add IcingSearchEngine initialization unit test for switching join index ======================================================================== [JoinIndex Improvement][10/x] Change/Add IcingSearchEngine unit tests ======================================================================== [JoinIndex Improvement][9/x] Integrate QualifiedIdJoinIndexImplV2 with IcingSearchEngine ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with JoinProcessor ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with QualifiedIdJoinIndexingHandler ======================================================================== [JoinIndex Improvement][7/x] Create QualifiedIdJoinIndex interface ======================================================================== [JoinIndex Improvement][6.1/x] Unit test (Optimize) ======================================================================== [JoinIndex Improvement][6.0/x] Unit test (General, Put, GetIterator) ======================================================================== [JoinIndex Improvement][5.3/x] Implement Optimize ======================================================================== Remove accents from Greek letters in normalizer ======================================================================== Make arm emulator tests build-only. ======================================================================== [JoinIndex Improvement][5.2/x] Implement GetIterator ======================================================================== [JoinIndex Improvement][5.1/x] Implement Put ======================================================================== [JoinIndex Improvement][5.0/x] Branch QualifiedIdJoinIndex to QualifiedIdJoinIndexImplV2 ======================================================================== [JoinIndex Improvement][4/x] Implement PostingListJoinDataAccessor ======================================================================== [JoinIndex Improvement][3/x] Implement PostingListJoinDataSerializer and DocumentIdToJoinInfo data type ======================================================================== [JoinIndex Improvement][2/x] Create NamespaceFingerprintIdentifier ======================================================================== [JoinIndex Improvement][1/x] Implement namespace_id_old_to_new in Compaction ======================================================================== Update test to also handle ICU 74 segmentation rules. ======================================================================== [Icing][Expand QueryStats][3/x] Add new fields into QueryStats (1) ======================================================================== [Icing][Expand QueryStats][2/x] Refactor QueryStatsProto ======================================================================== [Icing][Expand QueryStats][1/x] Publish DocHitInfoIterator CallStats ======================================================================== Add additional property filter tests ======================================================================== Deprecate hit_intersect_section_ids_mask in DocHitInfoIterator ======================================================================== Change default requires_full_emulation to False for portable_cc_test (third_party/icing/testing) ======================================================================== Cleanup Set requires_full_emulation to True for selective tests ======================================================================== Fix monkey test failures ======================================================================== Complete monkey test logic to change schema during monkey test runtime ======================================================================== Refactor monkey test to prepare for schema update ======================================================================== Fix the schema bug found by monkey test with seed 2551429844 ======================================================================== Move set query stats to the very top of InternalSearch() ======================================================================== Apply section restriction only on leaf nodes ======================================================================== [6/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Advanced query parser) ======================================================================== [5/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PersistentHashMap) ======================================================================== [4/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListIntegerIndexSerializer) ======================================================================== [3/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListHitSerializer) ======================================================================== [2/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Posting list storage) ======================================================================== [1/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Non-functional changes) ======================================================================== Decouple section restriction data from iterators ======================================================================== Fix the crash when a schema type gets more indexable properties than allowed ======================================================================== Add a checker to verify the property data type matches the schema. ======================================================================== Change global std::string in i18n-utils to constexpr std::string_view. ======================================================================== Adjust LiteIndex sort at indexing check conditions. ======================================================================== Fix the build error in aosp/2856025 ======================================================================== Bug: 305098009 Bug: 291130542 Bug: 275121148 Bug: 303239901 Bug: 301116242 Bug: 299321977 Bug: 300135897 Bug: 297549761 Bug: 309826655 Bug: 296349369 Bug: 302192690 Bug: 302609704 Bug: 301566713 Bug: 296938196 Change-Id: I957abd9da83e30106dac188677415bd68f64185b Merged-In: I957abd9da83e30106dac188677415bd68f64185b
2023-12-04Merge remote-tracking branch 'goog/androidx-platform-dev'Terry Wang
* goog/androidx-platform-dev: Update Icing from upstream. Update Icing from upstream. Update Icing from upstream. Descriptions: ======================================================================== Add @UsedByNative annotations to native* methods in IcingSearchEngineImpl. ======================================================================== [Icing][version 3] Bump kVersion to 3 ======================================================================== Make lite index magic dependent on `IcingSearchEngineOptions::build_property_existence_metadata_hits` ======================================================================== Add a flag in IcingSearchEngineOptions to control whether to build property existence metadata hits ======================================================================== Support `hasProperty(property_path)` in the advanced query language ======================================================================== Add PropertyExistenceIndexingHandler to index property existence metadata hit ======================================================================== [JoinIndex Improvement][11/x] Add IcingSearchEngine initialization unit test for switching join index ======================================================================== [JoinIndex Improvement][10/x] Change/Add IcingSearchEngine unit tests ======================================================================== [JoinIndex Improvement][9/x] Integrate QualifiedIdJoinIndexImplV2 with IcingSearchEngine ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with JoinProcessor ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with QualifiedIdJoinIndexingHandler ======================================================================== [JoinIndex Improvement][7/x] Create QualifiedIdJoinIndex interface ======================================================================== [JoinIndex Improvement][6.1/x] Unit test (Optimize) ======================================================================== [JoinIndex Improvement][6.0/x] Unit test (General, Put, GetIterator) ======================================================================== [JoinIndex Improvement][5.3/x] Implement Optimize ======================================================================== Remove accents from Greek letters in normalizer ======================================================================== Make arm emulator tests build-only. ======================================================================== [JoinIndex Improvement][5.2/x] Implement GetIterator ======================================================================== [JoinIndex Improvement][5.1/x] Implement Put ======================================================================== [JoinIndex Improvement][5.0/x] Branch QualifiedIdJoinIndex to QualifiedIdJoinIndexImplV2 ======================================================================== [JoinIndex Improvement][4/x] Implement PostingListJoinDataAccessor ======================================================================== [JoinIndex Improvement][3/x] Implement PostingListJoinDataSerializer and DocumentIdToJoinInfo data type ======================================================================== [JoinIndex Improvement][2/x] Create NamespaceFingerprintIdentifier ======================================================================== [JoinIndex Improvement][1/x] Implement namespace_id_old_to_new in Compaction ======================================================================== Update test to also handle ICU 74 segmentation rules. ======================================================================== [Icing][Expand QueryStats][3/x] Add new fields into QueryStats (1) ======================================================================== [Icing][Expand QueryStats][2/x] Refactor QueryStatsProto ======================================================================== [Icing][Expand QueryStats][1/x] Publish DocHitInfoIterator CallStats ======================================================================== Add additional property filter tests ======================================================================== Deprecate hit_intersect_section_ids_mask in DocHitInfoIterator ======================================================================== Change default requires_full_emulation to False for portable_cc_test (third_party/icing/testing) ======================================================================== Cleanup Set requires_full_emulation to True for selective tests ======================================================================== Fix monkey test failures ======================================================================== Complete monkey test logic to change schema during monkey test runtime ======================================================================== Refactor monkey test to prepare for schema update ======================================================================== Fix the schema bug found by monkey test with seed 2551429844 ======================================================================== Move set query stats to the very top of InternalSearch() ======================================================================== Apply section restriction only on leaf nodes ======================================================================== [6/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Advanced query parser) ======================================================================== [5/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PersistentHashMap) ======================================================================== [4/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListIntegerIndexSerializer) ======================================================================== [3/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListHitSerializer) ======================================================================== [2/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Posting list storage) ======================================================================== [1/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Non-functional changes) ======================================================================== Decouple section restriction data from iterators ======================================================================== Fix the crash when a schema type gets more indexable properties than allowed ======================================================================== Add a checker to verify the property data type matches the schema. ======================================================================== Change global std::string in i18n-utils to constexpr std::string_view. ======================================================================== Adjust LiteIndex sort at indexing check conditions. ======================================================================== Fix the build error in aosp/2856025 ======================================================================== Bug: 305098009 Bug: 307508735 Bug: 291130542 Bug: 275121148 Bug: 303239901 Bug: 301116242 Bug: 299321977 Bug: 300135897 Bug: 297549761 Bug: 309826655 Bug: 296349369 Bug: 302192690 Bug: 302609704 Bug: 301566713 Bug: 296938196 Change-Id: I957abd9da83e30106dac188677415bd68f64185b
2023-12-05Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: ↵Terry Wang
e7b69188bb Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2858548 Change-Id: Ib31d172049889444a55c31941ba9f7460d39148d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainTerry Wang
* aosp/upstream-master: Update Icing from upstream. Descriptions: ======================================================================== Rollback "Add a checker to verify the property data type matches the schema." ======================================================================== Bug: 299321977 Change-Id: I569f75db16611e0574b2c8df40508ec2ebd2d498
2023-12-04Update Icing from upstream.Terry Wang
Descriptions: ======================================================================== Rollback "Add a checker to verify the property data type matches the schema." ======================================================================== Bug: 299321977 Change-Id: I9f448463ecaae2b44ce31833a90d9672c33907b1
2023-12-02Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: ↵Jiayu Hu
77a3d7acfd Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2856025 Change-Id: I907cab2a8467672883f4a8572024c8d40e2aef05 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainJiayu Hu
* aosp/upstream-master: Update Icing from upstream. Update Icing from upstream. Update Icing from upstream. Descriptions: ======================================================================== Fix the build error in aosp/2856025 ======================================================================== [Icing][version 3] Bump kVersion to 3 ======================================================================== Make lite index magic dependent on `IcingSearchEngineOptions::build_property_existence_metadata_hits` ======================================================================== Add a flag in IcingSearchEngineOptions to control whether to build property existence metadata hits ======================================================================== Support `hasProperty(property_path)` in the advanced query language ======================================================================== Add PropertyExistenceIndexingHandler to index property existence metadata hit ======================================================================== [JoinIndex Improvement][11/x] Add IcingSearchEngine initialization unit test for switching join index ======================================================================== [JoinIndex Improvement][10/x] Change/Add IcingSearchEngine unit tests ======================================================================== [JoinIndex Improvement][9/x] Integrate QualifiedIdJoinIndexImplV2 with IcingSearchEngine ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with JoinProcessor ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with QualifiedIdJoinIndexingHandler ======================================================================== [JoinIndex Improvement][7/x] Create QualifiedIdJoinIndex interface ======================================================================== [JoinIndex Improvement][6.1/x] Unit test (Optimize) ======================================================================== [JoinIndex Improvement][6.0/x] Unit test (General, Put, GetIterator) ======================================================================== [JoinIndex Improvement][5.3/x] Implement Optimize ======================================================================== Remove accents from Greek letters in normalizer ======================================================================== Make arm emulator tests build-only. ======================================================================== [JoinIndex Improvement][5.2/x] Implement GetIterator ======================================================================== [JoinIndex Improvement][5.1/x] Implement Put ======================================================================== [JoinIndex Improvement][5.0/x] Branch QualifiedIdJoinIndex to QualifiedIdJoinIndexImplV2 ======================================================================== [JoinIndex Improvement][4/x] Implement PostingListJoinDataAccessor ======================================================================== [JoinIndex Improvement][3/x] Implement PostingListJoinDataSerializer and DocumentIdToJoinInfo data type ======================================================================== [JoinIndex Improvement][2/x] Create NamespaceFingerprintIdentifier ======================================================================== [JoinIndex Improvement][1/x] Implement namespace_id_old_to_new in Compaction ======================================================================== Update test to also handle ICU 74 segmentation rules. ======================================================================== [Icing][Expand QueryStats][3/x] Add new fields into QueryStats (1) ======================================================================== [Icing][Expand QueryStats][2/x] Refactor QueryStatsProto ======================================================================== [Icing][Expand QueryStats][1/x] Publish DocHitInfoIterator CallStats ======================================================================== Add additional property filter tests ======================================================================== Deprecate hit_intersect_section_ids_mask in DocHitInfoIterator ======================================================================== Change default requires_full_emulation to False for portable_cc_test (third_party/icing/testing) ======================================================================== Cleanup Set requires_full_emulation to True for selective tests ======================================================================== Fix monkey test failures ======================================================================== Complete monkey test logic to change schema during monkey test runtime ======================================================================== Refactor monkey test to prepare for schema update ======================================================================== Fix the schema bug found by monkey test with seed 2551429844 ======================================================================== Move set query stats to the very top of InternalSearch() ======================================================================== Apply section restriction only on leaf nodes ======================================================================== [6/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Advanced query parser) ======================================================================== [5/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PersistentHashMap) ======================================================================== [4/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListIntegerIndexSerializer) ======================================================================== [3/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListHitSerializer) ======================================================================== [2/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Posting list storage) ======================================================================== [1/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Non-functional changes) ======================================================================== Decouple section restriction data from iterators ======================================================================== Fix the crash when a schema type gets more indexable properties than allowed ======================================================================== Add a checker to verify the property data type matches the schema. ======================================================================== Change global std::string in i18n-utils to constexpr std::string_view. ======================================================================== Adjust LiteIndex sort at indexing check conditions. ======================================================================== Add @UsedByNative annotations to native* methods in IcingSearchEngineImpl. ======================================================================== Bug: 305098009 Bug: 307508735 Bug: 291130542 Bug: 275121148 Bug: 303239901 Bug: 301116242 Bug: 299321977 Bug: 300135897 Bug: 297549761 Bug: 309826655 Bug: 296349369 Bug: 302192690 Bug: 302609704 Bug: 301566713 Bug: 296938196 NO_IFTTT="False Alarm: The path is only valid in G3. kVersion is changed to 3, and schema is compatible with version 1." Change-Id: I1d50cf70261c8977e52047c8051e8d143f62ba2c
2023-12-01Update Icing from upstream.Jiayu Hu
Descriptions: ======================================================================== Fix the build error in aosp/2856025 ======================================================================== Change-Id: I8a1030d95d3221cc8484b98e0401b61b4e62a289
2023-11-30Update Icing from upstream.Jiayu Hu
Descriptions: ======================================================================== [Icing][version 3] Bump kVersion to 3 ======================================================================== Make lite index magic dependent on `IcingSearchEngineOptions::build_property_existence_metadata_hits` ======================================================================== Add a flag in IcingSearchEngineOptions to control whether to build property existence metadata hits ======================================================================== Support `hasProperty(property_path)` in the advanced query language ======================================================================== Add PropertyExistenceIndexingHandler to index property existence metadata hit ======================================================================== [JoinIndex Improvement][11/x] Add IcingSearchEngine initialization unit test for switching join index ======================================================================== [JoinIndex Improvement][10/x] Change/Add IcingSearchEngine unit tests ======================================================================== [JoinIndex Improvement][9/x] Integrate QualifiedIdJoinIndexImplV2 with IcingSearchEngine ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with JoinProcessor ======================================================================== [JoinIndex Improvement][8/x] Integrate QualifiedIdJoinIndexImplV2 with QualifiedIdJoinIndexingHandler ======================================================================== [JoinIndex Improvement][7/x] Create QualifiedIdJoinIndex interface ======================================================================== [JoinIndex Improvement][6.1/x] Unit test (Optimize) ======================================================================== [JoinIndex Improvement][6.0/x] Unit test (General, Put, GetIterator) ======================================================================== [JoinIndex Improvement][5.3/x] Implement Optimize ======================================================================== Remove accents from Greek letters in normalizer ======================================================================== Make arm emulator tests build-only. ======================================================================== [JoinIndex Improvement][5.2/x] Implement GetIterator ======================================================================== [JoinIndex Improvement][5.1/x] Implement Put ======================================================================== [JoinIndex Improvement][5.0/x] Branch QualifiedIdJoinIndex to QualifiedIdJoinIndexImplV2 ======================================================================== [JoinIndex Improvement][4/x] Implement PostingListJoinDataAccessor ======================================================================== [JoinIndex Improvement][3/x] Implement PostingListJoinDataSerializer and DocumentIdToJoinInfo data type ======================================================================== [JoinIndex Improvement][2/x] Create NamespaceFingerprintIdentifier ======================================================================== [JoinIndex Improvement][1/x] Implement namespace_id_old_to_new in Compaction ======================================================================== Update test to also handle ICU 74 segmentation rules. ======================================================================== [Icing][Expand QueryStats][3/x] Add new fields into QueryStats (1) ======================================================================== [Icing][Expand QueryStats][2/x] Refactor QueryStatsProto ======================================================================== [Icing][Expand QueryStats][1/x] Publish DocHitInfoIterator CallStats ======================================================================== Add additional property filter tests ======================================================================== Deprecate hit_intersect_section_ids_mask in DocHitInfoIterator ======================================================================== Change default requires_full_emulation to False for portable_cc_test (third_party/icing/testing) ======================================================================== Cleanup Set requires_full_emulation to True for selective tests ======================================================================== Fix monkey test failures ======================================================================== Complete monkey test logic to change schema during monkey test runtime ======================================================================== Refactor monkey test to prepare for schema update ======================================================================== Fix the schema bug found by monkey test with seed 2551429844 ======================================================================== Move set query stats to the very top of InternalSearch() ======================================================================== Apply section restriction only on leaf nodes ======================================================================== [6/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Advanced query parser) ======================================================================== [5/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PersistentHashMap) ======================================================================== [4/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListIntegerIndexSerializer) ======================================================================== [3/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (PostingListHitSerializer) ======================================================================== [2/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Posting list storage) ======================================================================== [1/n] Fix callsites in Icing that forgot to check libtextclassifier3::Status (Non-functional changes) ======================================================================== Decouple section restriction data from iterators ======================================================================== Fix the crash when a schema type gets more indexable properties than allowed ======================================================================== Add a checker to verify the property data type matches the schema. ======================================================================== Change global std::string in i18n-utils to constexpr std::string_view. ======================================================================== Adjust LiteIndex sort at indexing check conditions. ======================================================================== Bug: 305098009 Bug: 307508735 Bug: 291130542 Bug: 275121148 Bug: 303239901 Bug: 301116242 Bug: 299321977 Bug: 300135897 Bug: 297549761 Bug: 309826655 Bug: 296349369 Bug: 302192690 Bug: 302609704 Bug: 301566713 NO_IFTTT="False Alarm: The path is only valid in G3. kVersion is changed to 3, and schema is compatible with version 1." Change-Id: I8c4c3cd9b93e5240bd774f0a3d6d812f7a9ec198
2023-10-07[automerger skipped] Merge Android 14 am: 992d29d9b7 -s ours am: 41637157c7 ↵Xin Li
-s ours am: 1d26c787b6 -s ours am: 77d4a31650 -s ours am: 95f4ed2f5a -s ours am skip reason: Merged-In I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3 with SHA-1 112bb78dc8 is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2774926 Change-Id: I1ef3280e0496417688b2ead01cc8380c696725f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 992d29d9b7 -s ours am: 41637157c7 ↵Xin Li
-s ours am: 1d26c787b6 -s ours am: 77d4a31650 -s ours am skip reason: Merged-In I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3 with SHA-1 112bb78dc8 is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2774926 Change-Id: Ia32c068c837cf95a5d2b803569c8a0979a9af11a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 992d29d9b7 -s ours am: 41637157c7 ↵Xin Li
-s ours am: 1d26c787b6 -s ours am skip reason: Merged-In I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3 with SHA-1 112bb78dc8 is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2774926 Change-Id: Ic48c6d8d20f10efbecc44ce490a97dc143574fb0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 992d29d9b7 -s ours am: 41637157c7 ↵Xin Li
-s ours am skip reason: Merged-In I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3 with SHA-1 112bb78dc8 is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2774926 Change-Id: Id009dcb4afbeb342f685b6a163431320f28e87f6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06[automerger skipped] Merge Android 14 am: 992d29d9b7 -s oursXin Li
am skip reason: Merged-In I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3 with SHA-1 112bb78dc8 is already in history Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2774926 Change-Id: I5e1d262a010e16d3d16b274da4a7737f55e48ccb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3 Change-Id: I8d2fcb4c4afbecc56eeca60734ee340f5bff8875
2023-09-15Fix the crash when a schema type gets more indexable properties than allowed ↵Jiayu Hu
am: a7a951e46e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24773477 Change-Id: I35285d67eba1dc4c78b34da87fdc8fb4e2e984f3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15Fix the crash when a schema type gets more indexable properties than allowedJiayu Hu
This is a cherrypick for cl/565170429. Test: presubmits Change-Id: I42f619cfa02d33df9026c0638f9d202e0153ad37
2023-09-14Realign external/icing with upstream. am: c5857eb7dfTim Barron
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24734534 Change-Id: If03fd9cb698168269b5d5b703807702662c3e568 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Realign external/icing with upstream.Tim Barron
We ran into issues syncing external/icing because icing-search-engine-jni was trying to register functions that were being compiled out. With our updated proguard configuration in AppSearch, we can restore these registration calls and bring this code into sync with upstream. Test: presubmits Change-Id: I8f7e15475f7cf3ef4b1fe73983c6dea135548efe
2023-09-05Update Icing from upstream.Tim Barron
Descriptions: ======================================================================== Add @UsedByNative annotations to native* methods in IcingSearchEngineImpl. ======================================================================== Bug: 296938196 Change-Id: Ic0ed3b9a26dabe8bcd387f0545a5981f6e067fff
2023-09-05Merge remote-tracking branch 'goog/androidx-platform-dev' into ↵Terry Wang
udc-mainline-prod am: f0b8d56759 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24645416 Change-Id: Ib17ddc0a006fb8a5fccee8cbd48deff203e4766b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-03Merge remote-tracking branch 'goog/androidx-platform-dev' into udc-mainline-prodTerry Wang
* goog/androidx-platform-dev: Update Icing from upstream. Descriptions: ======================================================================== [fixit] Remove incorrect reserve usage for STL data structure ======================================================================== Move LiteIndex::SortHits() from the query path to the indexing path ======================================================================== Fix term frequency bug ======================================================================== Delete dead JNI functions. ======================================================================== Switch Icing JNI implementation to use RegisterNatives ======================================================================== Avoid unnecessary GetObjectClass and GetFieldID calls. ======================================================================== Add join test for SetSchemaNewIndexedDocumentPropertyTriggersIndexRestorationAndReturnsOk ======================================================================== Support different sets of properties to search for different schema types. ======================================================================== Do not cache the section mask for a schema type if no property filters apply while processing the type property filters. ======================================================================== Bug: 286418010 Bug: 297549761 Bug: 248295995 Bug: 296938196 Bug: 288310393 Bug: 291019114 Test: presubmit Change-Id: Iab66bcc3f92641122fae2ac36132f61d8e4b4f57
2023-08-31Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: ↵Grace Zhao
ea81bd0613 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2736298 Change-Id: I3c855187b62c1e346f46456c1899bc4ac986cd8c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-31Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainandroidx-wear-wear-tooling-preview-releaseandroidx-core-performance-releaseGrace Zhao
* aosp/upstream-master: Update Icing from upstream. Descriptions: ======================================================================== [fixit] Remove incorrect reserve usage for STL data structure ======================================================================== Move LiteIndex::SortHits() from the query path to the indexing path ======================================================================== Bug: 286418010 Bug: 297549761 Bug: 248295995 Change-Id: I6fcfd150036dc47a42181dfa14b410220da93d31
2023-08-30Update Icing from upstream.Grace Zhao
Descriptions: ======================================================================== [fixit] Remove incorrect reserve usage for STL data structure ======================================================================== Move LiteIndex::SortHits() from the query path to the indexing path ======================================================================== Bug: 286418010 Bug: 297549761 Bug: 248295995 Change-Id: I46168178e0227451b0f7dbf394bb6cc5db94e1e8
2023-08-30Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: ↵Tim Barron
3cb375c9f1 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2734133 Change-Id: I076fd3685455c387b6335d4be40b078acbc2bb19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainTim Barron
* aosp/upstream-master: Update Icing from upstream. Descriptions: ======================================================================== Fix term frequency bug ======================================================================== Delete dead JNI functions. ======================================================================== Switch Icing JNI implementation to use RegisterNatives ======================================================================== Avoid unnecessary GetObjectClass and GetFieldID calls. ======================================================================== Bug: 296938196 Change-Id: Idaaf78068bcfa8d9a34efd9b892c20049646874f
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: ea124336d2 -s ours ↵Xin Li
am: 368ea97ccb -s ours am: 3dcb8f8903 -s ours am: 3080c20abe -s ours am skip reason: Merged-In I7bc14ad1662585122d3f1e9fa0ecbcd409f4125f with SHA-1 a1fa306abe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24182674 Change-Id: I2ee3c7f096a881a2422b35cb3568d422dfd3d707 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: ea124336d2 -s ours ↵Xin Li
am: 368ea97ccb -s ours am: 3dcb8f8903 -s ours am skip reason: Merged-In I7bc14ad1662585122d3f1e9fa0ecbcd409f4125f with SHA-1 a1fa306abe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24182674 Change-Id: Ie763bdc983ff025f4834905770077af655ca9cce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: ea124336d2 -s ours ↵Xin Li
am: 368ea97ccb -s ours am skip reason: Merged-In I7bc14ad1662585122d3f1e9fa0ecbcd409f4125f with SHA-1 a1fa306abe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24182674 Change-Id: I18c0a34ed885c068af27a98ad4d70fe7eb51ea25 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: ea124336d2 -s oursXin Li
am skip reason: Merged-In I7bc14ad1662585122d3f1e9fa0ecbcd409f4125f with SHA-1 a1fa306abe is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24182674 Change-Id: I9c2bc82a174b020f528e6f75abbe462303ab92d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Move icing to be a simple java project am: ec9c4f473dAurimas Liutikas
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2724241 Change-Id: I2c970e933b3426941e6acc62717dacd645404e82 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-24Move icing to be a simple java projectAurimas Liutikas
Since icing is only bundled inside of appsearch:appsearch-local-storage there is no need to use an android project as at the end of the day we end up only including the jar of icing anyway. Moving to a java project simplifies is as now we no longer need to add special export configurations. We are also moving the dropping of *.proto files to the projects that bundle the libraries. This is a step towards making it easier to resolve what artifact coordinates were actually bundled inside. Test: ./gradlew appsearch:appsearch-local-storage:publish comparing out/androidx/build/support_repo/androidx/appsearch/appsearch-local-storage/1.1.0-alpha04/appsearch-local-storage-1.1.0-alpha04.aar before and after the change, libs/repackaged.jar is identical Bug: 296864329 Change-Id: Ibba769f71ecdb58cb20df0ea0c37364cf579eddf
2023-08-23Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I7bc14ad1662585122d3f1e9fa0ecbcd409f4125f Change-Id: Ic17c95cf8214b01946ca8915bfd4c834c64baaae
2023-08-23Update Icing from upstream.Tim Barron
Descriptions: ======================================================================== Fix term frequency bug ======================================================================== Delete dead JNI functions. ======================================================================== Switch Icing JNI implementation to use RegisterNatives ======================================================================== Avoid unnecessary GetObjectClass and GetFieldID calls. ======================================================================== Bug: 296938196 Change-Id: I773bcc05e768a7ac80f1950985b618047d009641
2023-08-23Use Truth library built from source. am: 112bb78dc8 am: 036ad662f3 am: ↵Krzysztof Kosiński
9b26351d70 am: 417b3fbdc4 am: ec3608a8c8 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2721760 Change-Id: If7c450ee836ac512caa36cc774398fd114fadbaf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 112bb78dc8 am: 036ad662f3 am: ↵Krzysztof Kosiński
9b26351d70 am: 417b3fbdc4 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2721760 Change-Id: Ib893ca75065d0f796cec99b06cca91a4a801191a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 112bb78dc8 am: 036ad662f3 am: ↵Krzysztof Kosiński
9b26351d70 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2721760 Change-Id: I364eaaf6137a06db140fdc4108ba736bc135f6c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 112bb78dc8 am: 036ad662f3Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2721760 Change-Id: I10329e4c38d0f9d55dd43ecad547162ae4963040 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source. am: 112bb78dc8Krzysztof Kosiński
Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2721760 Change-Id: If3a7472be858a94753160f1c6fabc307fdb96f2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-23Use Truth library built from source.Krzysztof Kosiński
Bug: 255714762 Test: presubmit Change-Id: I70cb8cf4edc69d2c6ba93085adfeaee77662a1d3
2023-08-08Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: ↵Yogesh Singh
734ee44256 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2697793 Change-Id: Ic4546cb71fb41efcc88f4ef768f902f59cd499e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainYogesh Singh
* aosp/upstream-master: Update Icing from upstream. Descriptions: ======================================================================== Add join test for SetSchemaNewIndexedDocumentPropertyTriggersIndexRestorationAndReturnsOk ======================================================================== Support different sets of properties to search for different schema types. ======================================================================== Do not cache the section mask for a schema type if no property filters apply while processing the type property filters. ======================================================================== Bug: 288310393 Bug: 291019114 Change-Id: If510ff1ef81f95c2dc10027c1faef0bee6b49aa6
2023-08-07Update Icing from upstream.Yogesh Singh
Descriptions: ======================================================================== Add join test for SetSchemaNewIndexedDocumentPropertyTriggersIndexRestorationAndReturnsOk ======================================================================== Support different sets of properties to search for different schema types. ======================================================================== Do not cache the section mask for a schema type if no property filters apply while processing the type property filters. ======================================================================== Bug: 288310393 Bug: 291019114 Change-Id: Icb867b40a603c0d63e2d96a0e2ec641e424aad7e
2023-07-19Merge remote-tracking branch 'goog/androidx-platform-dev' into ↵Grace Zhao
udc-mainline-prod am: 9fc1fa217d Original change: https://googleplex-android-review.googlesource.com/c/platform/external/icing/+/24131375 Change-Id: I5eeb464fb6bcee477751cdf8587260fe2f789f65 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19Merge remote-tracking branch 'goog/androidx-platform-dev' into udc-mainline-prodGrace Zhao
* goog/androidx-platform-dev: Update Icing from upstream. Descriptions: ======================================================================== [Icing][adhoc] Add backup schema producer unit tests for properties using indexable nested properties list ======================================================================== Fix SetSchema bug where adding an indexable nested document property does not trigger index-rebuild ======================================================================== Add join test for SetSchemaNewIndexedDocumentPropertyTriggersIndexRestorationAndReturnsOk ======================================================================== Bug: 291019114 Change-Id: I63850b4297cd70a8a10ccd32ddc34ddcbd303293
2023-07-17Merge remote-tracking branch 'aosp/upstream-master' into androidx-main am: ↵Grace Zhao
b83a3188c4 Original change: https://android-review.googlesource.com/c/platform/external/icing/+/2660355 Change-Id: I5d7224535c229dc53f59854ab1943291364d12b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17Merge remote-tracking branch 'aosp/upstream-master' into androidx-mainGrace Zhao
* aosp/upstream-master: Update Icing from upstream. Descriptions: ======================================================================== [Icing][adhoc] Add backup schema producer unit tests for properties using indexable nested properties list ======================================================================== Fix SetSchema bug where adding an indexable nested document property does not trigger index-rebuild ======================================================================== Add join test for SetSchemaNewIndexedDocumentPropertyTriggersIndexRestorationAndReturnsOk ======================================================================== Bug: 291019114 NO_IFTTT="Path is only valid in G3." Change-Id: Ib0f38921783a9ea2a964523439f3547250853cb0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 01:13:27 +0000