| 0ef6fe74c10e27d2e1b602a81a52f9c4053fdb03 |
|
07-Jan-2016 |
Zheng Fu <zhengfu@google.com> |
Respect join aggregation exceptions when breaking up an aggregation.
Currently during aggregation, the candidate set will be broken up if
there is a separate aggregation exception. This change is to keep the
raw contacts with join exceptions aggregated in this case.
Bug:25086633
Change-Id: Iab79b844d8f0850a610a612a5bcf7c430372f95d
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| e5bd832dd7743f98fd816f7e6568f715015764bd |
|
18-Jul-2015 |
Zheng Fu <zhengfu@google.com> |
Fix failing tests due to logic changes in the new aggregator.
1. All the raw contacts with same name and no data will group together,
so we need to assign different names in this test.
2. We don't have split step anymore, so there is no unpin operation.
3. Fix Long comparison in the aggregator.
Bug:22566083
Change-Id: I1a963bf17866e7569012e4cceca034e7c8312aa3
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| 772eda381913cc74f9d6f861c4236b95bb75ed9f |
|
15-Jul-2015 |
Zheng Fu <zhengfu@google.com> |
Performance turning for aggregator
1. Move identification matching to secondary
2. In the first stage, do secondary matching only if there is no
structured name
3. Aggregate all the raw contacts without structured name if they
have matching secondary data
4. Remove approximate name matching in aggregator. (This will not
impact the name variant, such as John and Johathan matching)
Bug:22200630
Bug:21931859
Change-Id: I295e283dbe1929e20b80272027df226c01bc2f74
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| d0d961e19f19704f7967dadf5be61fe6273a1d32 |
|
01-Jun-2015 |
Zheng Fu <zhengfu@google.com> |
Performance tuning for contact aggregator2
1. Skip already aggregated raw contacts during aggregation algorithm upgrade.
2. Remove case conversion during email comparion for better performance.
3. Fix bugs in the ContactAggregatorHelper to fix the flaky unit test.
Bug:21466686
Bug:19908937
Change-Id: I6f59894a4fdc605fe1b92ac82e2ac9e90561a158
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| 3a83f4c60fbe7eb2ee31186d0675dcfbac3ee6b5 |
|
27-May-2015 |
Makoto Onuki <omakoto@google.com> |
Fix invalidateAggregationExceptionCache().
Also clean up aggregator in preparation in preparation for b/19482664
Two tests in ContactAggregator2Test are failing, but it's irrelevant to this
change. (Bug filed for this.)
Change-Id: Id630812335fdaa2ab4955c240700b82fed84d1a8
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| 891e5b4c377258ff7d7259f2bab6cd6bff202aee |
|
15-May-2015 |
Zheng Fu <zhengfu@google.com> |
Fix bugs in aggregator2.
0. Add unit test for aggregator2.
1. Only aggregate raw contacts in the default directory
2. Remove aggregation exception matches from the aggregation suggestion list
3. Fix the sqls to clear primary settings when merging
4. Make the scoring system consistent with current aggregator.
5. Don't aggregate raw contacts without name to any other raw contacts even
when data matching exist.
Bug: 19908937
Change-Id: Ie580def5ee9e3a291cd5bf112ccb29627f9b67cc
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| 74e4f99cada94d6ca6be5d1bfee9abe7c4561253 |
|
25-Apr-2015 |
Zheng Fu <zhengfu@google.com> |
Fix some set concurrency issues in new aggregator.
Bug:19908937
Change-Id: Iade51905c1e5a1810b709d7b533984ceb6254939
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| aa18c233fdec3359c5231d4a5f61188446bf5d6f |
|
16-Apr-2015 |
Zheng Fu <zhengfu@google.com> |
use new setting flag to switch between current and new aggregator.
In order for the switch, add AbstractContactAggregator for
ContactAggregator and ContactAggregator2.
Bug:20055573
Change-Id: I6f27d4df8017938b226f5c6371b15ba41fd18acd
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| 6012b85f0eef8ebcfcb73b72216d17893804d4ea |
|
02-Apr-2015 |
Zheng Fu <zhengfu@google.com> |
Add some new method implementations for new contact aggregator.
Also add a ContactAggregatorHelper class to hold some helper methods
to better falicitate unit testing
Bug:19908937
Change-Id: I2e2bcef2228e7a171e9c3259c27c3fa28bde646c
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| d6c0a1330d3e51706d70351a34631f1f4e8fb02f |
|
26-Mar-2015 |
Zheng Fu <zhengfu@google.com> |
New contact aggregator (part 1)
Summary of the changes are:
1. In RawContactMatcher, add rawContactId and accountId to MatchScore
inner class, so that match score is on raw contacts level instead]
of accumulate to contact level
2. Add a wrapper RawContactMatchingCandidates to MatchScore to
facilitate the aggregation.
3. In ContactAggregator2, add findRawContactMatchingCandidates()
method to find the set of matching raw contacts for a given
raw_contact_id. This method will use the logic of
updateMatchScoresForSuggestionsBasedOnDataMatches() so that
it will give a set of raw contacts candidate with matching score
above threshold.
4. The second stage "Pair-wise comparison and find the
connected component of all the raw contacts in
RawContactMatchingCandidates" is done in new method
reAggregateRawContacts();
5. Some new methods still throw unSupportedOperationExceptions, and
they will be implemented in part2.
6. Tests will be implemented in follow-up cls.
Bug:19908937
Change-Id: I53483a29c24401e2f38a727168e7431cef86370a
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|
| 3e2e34d46cca69ba09715b7d2e4c165d84d19ee5 |
|
27-Feb-2015 |
Zheng Fu <zhengfu@google.com> |
Fork ContactAggregator.java to ContactAggregator2.java
This is to copy the file history for new aggregator.
Change-Id: I57994a3c1ed0eaeaffa45bf921b2e17dbcf702d3
/packages/providers/ContactsProvider/src/com/android/providers/contacts/aggregation/ContactAggregator2.java
|