Added lookahead caching for addressbook (SQL-only) for speed improvement.

1 files changed, 124 insertions, 30 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index dda23cc..abfd944 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -297,34 +297,35 @@ namespace {
     FindQuery::FindQuery(const QArray<int>& ints)
         : OSQLQuery(), m_uids( ints ){
     }
     FindQuery::~FindQuery() {
     }
     QString FindQuery::query()const{
-//      if ( m_uids.count() == 0 )
-        return single();
+            if ( m_uids.count() == 0 )
+                    return single();
+            else
+                    return multi();
     }
-    /*
-      else
-            return multi();
-            }
-        QString FindQuery::multi()const {
-        QString qu = "select uid, type, value from addressbook where";
-        for (uint i = 0; i < m_uids.count(); i++ ) {
-            qu += " UID = " + QString::number( m_uids[i] ) + " OR";
-        }
-        qu.remove( qu.length()-2, 2 ); // Hmmmm..
-        return qu;
+        
+    QString FindQuery::multi()const {
+            QString qu = "select * from addressbook where";
+            for (uint i = 0; i < m_uids.count(); i++ ) {
+                    qu += " uid = " + QString::number( m_uids[i] ) + " OR";
+            }
+            qu.remove( qu.length()-2, 2 ); // Hmmmm..
+
+            odebug << "find query: " << qu << "" << oendl;
+            return qu;
     }
-    */
-    QString FindQuery::single()const{
-        QString qu = "select *";
-        qu += " from addressbook where uid = " + QString::number(m_uid);
 
-        // owarn << "find query: " << qu << "" << oendl;
-        return qu;
+    QString FindQuery::single()const{
+            QString qu = "select *";
+            qu += " from addressbook where uid = " + QString::number(m_uid);
+            
+            // owarn << "find query: " << qu << "" << oendl;
+            return qu;
     }
 
 
     FindCustomQuery::FindCustomQuery(int uid)
         : OSQLQuery(), m_uid( uid ) {
     }
@@ -470,23 +471,64 @@ bool OPimContactAccessBackend_SQL::replace ( const OPimContact &contact )
     return add( contact );
 }
 
 
 OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
 {
-    odebug << "OPimContactAccessBackend_SQL::find()" << oendl;
+    odebug << "OPimContactAccessBackend_SQL::find(" << uid << ")" << oendl;
     QTime t;
     t.start();
 
     OPimContact retContact( requestNonCustom( uid ) );
     retContact.setExtraMap( requestCustom( uid ) );
 
     odebug << "OPimContactAccessBackend_SQL::find() needed: " << t.elapsed() << " ms" << oendl;
     return retContact;
 }
 
+OPimContact OPimContactAccessBackend_SQL::find( int uid, const QArray<int>& queryUids, uint current, Frontend::CacheDirection direction ) const
+{
+    odebug << "OPimContactAccessBackend_SQL::find( ..multi.. )" << oendl;
+    odebug << "searching for " << uid << "" << oendl;
+
+    QTime t;
+    t.start();
+        
+    uint numReadAhead = readAhead();
+    QArray<int> searchList( numReadAhead );
+ 
+    uint size =0;
+
+    // Build an array with all elements which should be requested and cached
+    // We will just request "numReadAhead" elements, starting from "current" position in
+    // the list of many uids !
+    switch( direction ) {
+        /* forward */
+    case Frontend::Forward:
+        for ( uint i = current; i < queryUids.count() && size < numReadAhead; i++ ) {
+            searchList[size] = queryUids[i];
+            size++;
+        }
+        break;
+        /* reverse */
+    case Frontend::Reverse:
+        for ( uint i = current; i != 0 && size <  numReadAhead; i-- ) {
+            searchList[size] = queryUids[i];
+            size++;
+        }
+        break;
+    }
+
+    //Shrink to real size..
+    searchList.resize( size );
+
+    OPimContact retContact( requestContactsAndCache( uid, searchList ) );
+
+    odebug << "OPimContactAccessBackend_SQL::find( ..multi.. ) needed: " << t.elapsed() << " ms" << oendl;
+    return retContact;
+}
 
 
 QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& qd )
 {
     QString qu = "SELECT uid FROM addressbook WHERE";
     QString searchQuery ="";
@@ -765,35 +807,92 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
 
 QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const
 {
     QTime t;
     t.start();
 
-    QMap<int, QString> nonCustomMap;
-
     int t2needed = 0;
     int t3needed = 0;
     QTime t2;
     t2.start();
     FindQuery query( uid );
     OSQLResult res_noncustom = m_driver->query( &query );
     t2needed = t2.elapsed();
 
     OSQLResultItem resItem = res_noncustom.first();
 
+    QMap<int, QString> nonCustomMap;
     QTime t3;
     t3.start();
+    nonCustomMap = fillNonCustomMap( resItem );
+    t3needed = t3.elapsed();
+    
+
+    // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl;
+    odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed
+           << " ms, mapping: " << t3needed << " ms" << oendl;
+
+    return nonCustomMap;
+}
+
+/* Returns contact requested by uid and fills cache with contacts requested by uids in the cachelist */ 
+OPimContact OPimContactAccessBackend_SQL::requestContactsAndCache( int uid, const QArray<int>& uidlist )const
+{
+        // We want to get all contacts with one query.
+        // We don't have to add the given uid to the uidlist, it is expected to be there already (see opimrecordlist.h).
+        // All contacts will be stored in the cache, afterwards the contact with the user id "uid" will be returned
+        // by using the cache..  
+        QArray<int> cachelist = uidlist;
+
+        odebug << "Reqest and cache" << cachelist.size() << "elements !" << oendl;
+
+        QTime t;
+        t.start();
+
+        int t2needed = 0;
+        int t3needed = 0;
+        QTime t2;
+        t2.start();
+        FindQuery query( cachelist );
+        OSQLResult res_noncustom = m_driver->query( &query );
+        t2needed = t2.elapsed();
+
+        QMap<int, QString> nonCustomMap;
+        QTime t3;
+        t3.start();
+        OSQLResultItem resItem = res_noncustom.first();
+        do {
+                OPimContact contact( fillNonCustomMap( resItem ) );
+                contact.setExtraMap( requestCustom( contact.uid() ) );
+                odebug << "Caching uid: " << contact.uid() << oendl;
+                cache( contact );
+                resItem = res_noncustom.next();
+        } while ( ! res_noncustom.atEnd() ); //atEnd() is true if we are past(!) the list !!
+        t3needed = t3.elapsed();
+    
+
+        // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl;
+        odebug << "RequestContactsAndCache needed: insg.:" << t.elapsed() << " ms, query: " << t2needed
+               << " ms, mapping: " << t3needed << " ms" << oendl;
+        
+        return cacheFind( uid );
+}
+
+QMap<int, QString> OPimContactAccessBackend_SQL::fillNonCustomMap( const OSQLResultItem& resultItem ) const
+{
+    QMap<int, QString> nonCustomMap;
+
     // Now loop through all columns
     QStringList fieldList = OPimContactFields::untrfields( false );
     QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
     for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
         // Get data for the selected column and store it with the
         // corresponding id into the map..
 
         int id =  translate[*it];
-        QString value = resItem.data( (*it) );
+        QString value = resultItem.data( (*it) );
 
         // odebug << "Reading " << (*it) << "... found: " << value << "" << oendl;
 
         switch( id ){
         case Qtopia::Birthday:
         case Qtopia::Anniversary:{
@@ -813,23 +912,18 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
             odebug << "Category is: " << value << "" << oendl;
         default:
             nonCustomMap.insert( id, value );
         }
     }
 
-    // First insert uid
-    nonCustomMap.insert( Qtopia::AddressUid, resItem.data( "uid" ) );
-    t3needed = t3.elapsed();
-
-    // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl;
-    odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed
-           << " ms, mapping: " << t3needed << " ms" << oendl;
+    nonCustomMap.insert( Qtopia::AddressUid, resultItem.data( "uid" ) );
 
     return nonCustomMap;
 }
 
+
 QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) const
 {
     QTime t;
     t.start();
 
     QMap<QString, QString> customMap;