From 4eaf712630afd878137a362e545953da8bb28501 Mon Sep 17 00:00:00 2001
From: Matt Vogt <matthew.vogt@jollamobile.com>
Date: Thu, 19 Jun 2014 18:43:47 +1000
Subject: [PATCH] [libcontacts] Remove unnecessary sorting

When sorting is not required, clear the sort property of the fetch
request; the sorting does not cause errors, but results in unnecessary
effort to process the query.
---
 src/seasidecache.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/seasidecache.cpp b/src/seasidecache.cpp
index 6011b2b..cde461b 100644
--- a/src/seasidecache.cpp
+++ b/src/seasidecache.cpp
@@ -159,7 +159,8 @@ QContactFetchHint presenceFetchHint()
     QContactFetchHint fetchHint(basicFetchHint());
 
     setDetailTypesHint(fetchHint, DetailList() << detailType<QContactPresence>()
-                                               << detailType<QContactGlobalPresence>());
+                                               << detailType<QContactGlobalPresence>()
+                                               << detailType<QContactOnlineAccount>());
 
     return fetchHint;
 }
@@ -1583,12 +1584,14 @@ void SeasideCache::startRequest(bool *idleProcessing)
                 requestPending = true;
             } else {
                 // Fetch the missing data types for whichever contacts need them
+                m_fetchRequest.setSorting(m_sortOrder);
                 if (unfetchedTypes == SeasideCache::FetchPhoneNumber) {
                     m_fetchRequest.setFilter(QContactStatusFlags::matchFlag(QContactStatusFlags::HasPhoneNumber, QContactFilter::MatchContains));
                 } else if (unfetchedTypes == SeasideCache::FetchEmailAddress) {
                     m_fetchRequest.setFilter(QContactStatusFlags::matchFlag(QContactStatusFlags::HasEmailAddress, QContactFilter::MatchContains));
                 } else if (unfetchedTypes == SeasideCache::FetchAccountUri) {
                     m_fetchRequest.setFilter(QContactStatusFlags::matchFlag(QContactStatusFlags::HasOnlineAccount, QContactFilter::MatchContains));
+                    m_fetchRequest.setSorting(m_onlineSortOrder);
                 } else {
                     m_fetchRequest.setFilter(allFilter());
                 }
@@ -1637,6 +1640,7 @@ void SeasideCache::startRequest(bool *idleProcessing)
             // as the favorites store, so we don't update any favorite with a smaller data subset
             m_activeResolve = &resolve;
             m_fetchRequest.setFetchHint(resolve.requireComplete ? basicFetchHint() : favoriteFetchHint(m_fetchTypes | m_extraFetchTypes));
+            m_fetchRequest.setSorting(QList<QContactSortOrder>());
             m_fetchRequest.start();
 
             m_fetchProcessedCount = 0;
@@ -1664,6 +1668,7 @@ void SeasideCache::startRequest(bool *idleProcessing)
             // we only want to retrieve aggregate contacts that have changed
             m_fetchRequest.setFilter(filter & aggregateFilter());
             m_fetchRequest.setFetchHint(basicFetchHint());
+            m_fetchRequest.setSorting(QList<QContactSortOrder>());
             m_fetchRequest.start();
 
             m_fetchProcessedCount = 0;
@@ -1687,6 +1692,7 @@ void SeasideCache::startRequest(bool *idleProcessing)
 
             m_fetchRequest.setFilter(filter & aggregateFilter());
             m_fetchRequest.setFetchHint(presenceFetchHint());
+            m_fetchRequest.setSorting(QList<QContactSortOrder>());
             m_fetchRequest.start();
 
             m_fetchProcessedCount = 0;