-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp | 128 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_sql.h | 5 | ||||
-rw-r--r-- | libopie2/opiepim/backend/opimaccessbackend.h | 20 |
3 files changed, 134 insertions, 19 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,28 +297,29 @@ namespace { | |||
297 | FindQuery::FindQuery(const QArray<int>& ints) | 297 | FindQuery::FindQuery(const QArray<int>& ints) |
298 | : OSQLQuery(), m_uids( ints ){ | 298 | : OSQLQuery(), m_uids( ints ){ |
299 | } | 299 | } |
300 | FindQuery::~FindQuery() { | 300 | FindQuery::~FindQuery() { |
301 | } | 301 | } |
302 | QString FindQuery::query()const{ | 302 | QString FindQuery::query()const{ |
303 | // if ( m_uids.count() == 0 ) | 303 | if ( m_uids.count() == 0 ) |
304 | return single(); | 304 | return single(); |
305 | } | ||
306 | /* | ||
307 | else | 305 | else |
308 | return multi(); | 306 | return multi(); |
309 | } | 307 | } |
308 | |||
310 | QString FindQuery::multi()const { | 309 | QString FindQuery::multi()const { |
311 | QString qu = "select uid, type, value from addressbook where"; | 310 | QString qu = "select * from addressbook where"; |
312 | for (uint i = 0; i < m_uids.count(); i++ ) { | 311 | for (uint i = 0; i < m_uids.count(); i++ ) { |
313 | qu += " UID = " + QString::number( m_uids[i] ) + " OR"; | 312 | qu += " uid = " + QString::number( m_uids[i] ) + " OR"; |
314 | } | 313 | } |
315 | qu.remove( qu.length()-2, 2 ); // Hmmmm.. | 314 | qu.remove( qu.length()-2, 2 ); // Hmmmm.. |
315 | |||
316 | odebug << "find query: " << qu << "" << oendl; | ||
316 | return qu; | 317 | return qu; |
317 | } | 318 | } |
318 | */ | 319 | |
319 | QString FindQuery::single()const{ | 320 | QString FindQuery::single()const{ |
320 | QString qu = "select *"; | 321 | QString qu = "select *"; |
321 | qu += " from addressbook where uid = " + QString::number(m_uid); | 322 | qu += " from addressbook where uid = " + QString::number(m_uid); |
322 | 323 | ||
323 | // owarn << "find query: " << qu << "" << oendl; | 324 | // owarn << "find query: " << qu << "" << oendl; |
324 | return qu; | 325 | return qu; |
@@ -470,23 +471,64 @@ bool OPimContactAccessBackend_SQL::replace ( const OPimContact &contact ) | |||
470 | return add( contact ); | 471 | return add( contact ); |
471 | } | 472 | } |
472 | 473 | ||
473 | 474 | ||
474 | OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const | 475 | OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const |
475 | { | 476 | { |
476 | odebug << "OPimContactAccessBackend_SQL::find()" << oendl; | 477 | odebug << "OPimContactAccessBackend_SQL::find(" << uid << ")" << oendl; |
477 | QTime t; | 478 | QTime t; |
478 | t.start(); | 479 | t.start(); |
479 | 480 | ||
480 | OPimContact retContact( requestNonCustom( uid ) ); | 481 | OPimContact retContact( requestNonCustom( uid ) ); |
481 | retContact.setExtraMap( requestCustom( uid ) ); | 482 | retContact.setExtraMap( requestCustom( uid ) ); |
482 | 483 | ||
483 | odebug << "OPimContactAccessBackend_SQL::find() needed: " << t.elapsed() << " ms" << oendl; | 484 | odebug << "OPimContactAccessBackend_SQL::find() needed: " << t.elapsed() << " ms" << oendl; |
484 | return retContact; | 485 | return retContact; |
485 | } | 486 | } |
486 | 487 | ||
488 | OPimContact OPimContactAccessBackend_SQL::find( int uid, const QArray<int>& queryUids, uint current, Frontend::CacheDirection direction ) const | ||
489 | { | ||
490 | odebug << "OPimContactAccessBackend_SQL::find( ..multi.. )" << oendl; | ||
491 | odebug << "searching for " << uid << "" << oendl; | ||
492 | |||
493 | QTime t; | ||
494 | t.start(); | ||
495 | |||
496 | uint numReadAhead = readAhead(); | ||
497 | QArray<int> searchList( numReadAhead ); | ||
498 | |||
499 | uint size =0; | ||
500 | |||
501 | // Build an array with all elements which should be requested and cached | ||
502 | // We will just request "numReadAhead" elements, starting from "current" position in | ||
503 | // the list of many uids ! | ||
504 | switch( direction ) { | ||
505 | /* forward */ | ||
506 | case Frontend::Forward: | ||
507 | for ( uint i = current; i < queryUids.count() && size < numReadAhead; i++ ) { | ||
508 | searchList[size] = queryUids[i]; | ||
509 | size++; | ||
510 | } | ||
511 | break; | ||
512 | /* reverse */ | ||
513 | case Frontend::Reverse: | ||
514 | for ( uint i = current; i != 0 && size < numReadAhead; i-- ) { | ||
515 | searchList[size] = queryUids[i]; | ||
516 | size++; | ||
517 | } | ||
518 | break; | ||
519 | } | ||
520 | |||
521 | //Shrink to real size.. | ||
522 | searchList.resize( size ); | ||
523 | |||
524 | OPimContact retContact( requestContactsAndCache( uid, searchList ) ); | ||
525 | |||
526 | odebug << "OPimContactAccessBackend_SQL::find( ..multi.. ) needed: " << t.elapsed() << " ms" << oendl; | ||
527 | return retContact; | ||
528 | } | ||
487 | 529 | ||
488 | 530 | ||
489 | QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& qd ) | 531 | QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& qd ) |
490 | { | 532 | { |
491 | QString qu = "SELECT uid FROM addressbook WHERE"; | 533 | QString qu = "SELECT uid FROM addressbook WHERE"; |
492 | QString searchQuery =""; | 534 | QString searchQuery =""; |
@@ -765,35 +807,92 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const | |||
765 | 807 | ||
766 | QMap<int, QString> OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const | 808 | QMap<int, QString> OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const |
767 | { | 809 | { |
768 | QTime t; | 810 | QTime t; |
769 | t.start(); | 811 | t.start(); |
770 | 812 | ||
771 | QMap<int, QString> nonCustomMap; | ||
772 | |||
773 | int t2needed = 0; | 813 | int t2needed = 0; |
774 | int t3needed = 0; | 814 | int t3needed = 0; |
775 | QTime t2; | 815 | QTime t2; |
776 | t2.start(); | 816 | t2.start(); |
777 | FindQuery query( uid ); | 817 | FindQuery query( uid ); |
778 | OSQLResult res_noncustom = m_driver->query( &query ); | 818 | OSQLResult res_noncustom = m_driver->query( &query ); |
779 | t2needed = t2.elapsed(); | 819 | t2needed = t2.elapsed(); |
780 | 820 | ||
781 | OSQLResultItem resItem = res_noncustom.first(); | 821 | OSQLResultItem resItem = res_noncustom.first(); |
782 | 822 | ||
823 | QMap<int, QString> nonCustomMap; | ||
783 | QTime t3; | 824 | QTime t3; |
784 | t3.start(); | 825 | t3.start(); |
826 | nonCustomMap = fillNonCustomMap( resItem ); | ||
827 | t3needed = t3.elapsed(); | ||
828 | |||
829 | |||
830 | // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl; | ||
831 | odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed | ||
832 | << " ms, mapping: " << t3needed << " ms" << oendl; | ||
833 | |||
834 | return nonCustomMap; | ||
835 | } | ||
836 | |||
837 | /* Returns contact requested by uid and fills cache with contacts requested by uids in the cachelist */ | ||
838 | OPimContact OPimContactAccessBackend_SQL::requestContactsAndCache( int uid, const QArray<int>& uidlist )const | ||
839 | { | ||
840 | // We want to get all contacts with one query. | ||
841 | // We don't have to add the given uid to the uidlist, it is expected to be there already (see opimrecordlist.h). | ||
842 | // All contacts will be stored in the cache, afterwards the contact with the user id "uid" will be returned | ||
843 | // by using the cache.. | ||
844 | QArray<int> cachelist = uidlist; | ||
845 | |||
846 | odebug << "Reqest and cache" << cachelist.size() << "elements !" << oendl; | ||
847 | |||
848 | QTime t; | ||
849 | t.start(); | ||
850 | |||
851 | int t2needed = 0; | ||
852 | int t3needed = 0; | ||
853 | QTime t2; | ||
854 | t2.start(); | ||
855 | FindQuery query( cachelist ); | ||
856 | OSQLResult res_noncustom = m_driver->query( &query ); | ||
857 | t2needed = t2.elapsed(); | ||
858 | |||
859 | QMap<int, QString> nonCustomMap; | ||
860 | QTime t3; | ||
861 | t3.start(); | ||
862 | OSQLResultItem resItem = res_noncustom.first(); | ||
863 | do { | ||
864 | OPimContact contact( fillNonCustomMap( resItem ) ); | ||
865 | contact.setExtraMap( requestCustom( contact.uid() ) ); | ||
866 | odebug << "Caching uid: " << contact.uid() << oendl; | ||
867 | cache( contact ); | ||
868 | resItem = res_noncustom.next(); | ||
869 | } while ( ! res_noncustom.atEnd() ); //atEnd() is true if we are past(!) the list !! | ||
870 | t3needed = t3.elapsed(); | ||
871 | |||
872 | |||
873 | // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl; | ||
874 | odebug << "RequestContactsAndCache needed: insg.:" << t.elapsed() << " ms, query: " << t2needed | ||
875 | << " ms, mapping: " << t3needed << " ms" << oendl; | ||
876 | |||
877 | return cacheFind( uid ); | ||
878 | } | ||
879 | |||
880 | QMap<int, QString> OPimContactAccessBackend_SQL::fillNonCustomMap( const OSQLResultItem& resultItem ) const | ||
881 | { | ||
882 | QMap<int, QString> nonCustomMap; | ||
883 | |||
785 | // Now loop through all columns | 884 | // Now loop through all columns |
786 | QStringList fieldList = OPimContactFields::untrfields( false ); | 885 | QStringList fieldList = OPimContactFields::untrfields( false ); |
787 | QMap<QString, int> translate = OPimContactFields::untrFieldsToId(); | 886 | QMap<QString, int> translate = OPimContactFields::untrFieldsToId(); |
788 | for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){ | 887 | for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){ |
789 | // Get data for the selected column and store it with the | 888 | // Get data for the selected column and store it with the |
790 | // corresponding id into the map.. | 889 | // corresponding id into the map.. |
791 | 890 | ||
792 | int id = translate[*it]; | 891 | int id = translate[*it]; |
793 | QString value = resItem.data( (*it) ); | 892 | QString value = resultItem.data( (*it) ); |
794 | 893 | ||
795 | // odebug << "Reading " << (*it) << "... found: " << value << "" << oendl; | 894 | // odebug << "Reading " << (*it) << "... found: " << value << "" << oendl; |
796 | 895 | ||
797 | switch( id ){ | 896 | switch( id ){ |
798 | case Qtopia::Birthday: | 897 | case Qtopia::Birthday: |
799 | case Qtopia::Anniversary:{ | 898 | case Qtopia::Anniversary:{ |
@@ -813,23 +912,18 @@ QMap<int, QString> OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co | |||
813 | odebug << "Category is: " << value << "" << oendl; | 912 | odebug << "Category is: " << value << "" << oendl; |
814 | default: | 913 | default: |
815 | nonCustomMap.insert( id, value ); | 914 | nonCustomMap.insert( id, value ); |
816 | } | 915 | } |
817 | } | 916 | } |
818 | 917 | ||
819 | // First insert uid | 918 | nonCustomMap.insert( Qtopia::AddressUid, resultItem.data( "uid" ) ); |
820 | nonCustomMap.insert( Qtopia::AddressUid, resItem.data( "uid" ) ); | ||
821 | t3needed = t3.elapsed(); | ||
822 | |||
823 | // odebug << "Adding UID: " << resItem.data( "uid" ) << "" << oendl; | ||
824 | odebug << "RequestNonCustom needed: insg.:" << t.elapsed() << " ms, query: " << t2needed | ||
825 | << " ms, mapping: " << t3needed << " ms" << oendl; | ||
826 | 919 | ||
827 | return nonCustomMap; | 920 | return nonCustomMap; |
828 | } | 921 | } |
829 | 922 | ||
923 | |||
830 | QMap<QString, QString> OPimContactAccessBackend_SQL::requestCustom( int uid ) const | 924 | QMap<QString, QString> OPimContactAccessBackend_SQL::requestCustom( int uid ) const |
831 | { | 925 | { |
832 | QTime t; | 926 | QTime t; |
833 | t.start(); | 927 | t.start(); |
834 | 928 | ||
835 | QMap<QString, QString> customMap; | 929 | QMap<QString, QString> customMap; |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h index ba122ec..4f81735 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h | |||
@@ -70,14 +70,13 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend { | |||
70 | 70 | ||
71 | bool wasChangedExternally(); | 71 | bool wasChangedExternally(); |
72 | 72 | ||
73 | QArray<int> allRecords() const; | 73 | QArray<int> allRecords() const; |
74 | 74 | ||
75 | OPimContact find ( int uid ) const; | 75 | OPimContact find ( int uid ) const; |
76 | // FIXME: Add lookahead-cache support ! | 76 | OPimContact find( int uid, const QArray<int>&, uint cur, Frontend::CacheDirection ) const; |
77 | //OPimContact find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const; | ||
78 | 77 | ||
79 | QArray<int> queryByExample ( const OPimContact &query, int settings, | 78 | QArray<int> queryByExample ( const OPimContact &query, int settings, |
80 | const QDateTime& d ); | 79 | const QDateTime& d ); |
81 | 80 | ||
82 | QArray<int> matchRegexp( const QRegExp &r ) const; | 81 | QArray<int> matchRegexp( const QRegExp &r ) const; |
83 | 82 | ||
@@ -95,12 +94,14 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend { | |||
95 | bool reload(); | 94 | bool reload(); |
96 | 95 | ||
97 | private: | 96 | private: |
98 | QArray<int> extractUids( Opie::DB::OSQLResult& res ) const; | 97 | QArray<int> extractUids( Opie::DB::OSQLResult& res ) const; |
99 | QMap<int, QString> requestNonCustom( int uid ) const; | 98 | QMap<int, QString> requestNonCustom( int uid ) const; |
100 | QMap<QString, QString> requestCustom( int uid ) const; | 99 | QMap<QString, QString> requestCustom( int uid ) const; |
100 | QMap<int, QString> fillNonCustomMap( const Opie::DB::OSQLResultItem& resultItem ) const; | ||
101 | OPimContact requestContactsAndCache( int uid, const QArray<int>& cachelist ) const; | ||
101 | void update(); | 102 | void update(); |
102 | 103 | ||
103 | protected: | 104 | protected: |
104 | bool m_changed; | 105 | bool m_changed; |
105 | QString m_fileName; | 106 | QString m_fileName; |
106 | QArray<int> m_uids; | 107 | QArray<int> m_uids; |
diff --git a/libopie2/opiepim/backend/opimaccessbackend.h b/libopie2/opiepim/backend/opimaccessbackend.h index 0682063..15a7b7f 100644 --- a/libopie2/opiepim/backend/opimaccessbackend.h +++ b/libopie2/opiepim/backend/opimaccessbackend.h | |||
@@ -125,15 +125,23 @@ public: | |||
125 | /** | 125 | /** |
126 | * set the read ahead count | 126 | * set the read ahead count |
127 | */ | 127 | */ |
128 | void setReadAhead( uint count ); | 128 | void setReadAhead( uint count ); |
129 | protected: | 129 | protected: |
130 | int access()const; | 130 | int access()const; |
131 | |||
131 | void cache( const T& t )const; | 132 | void cache( const T& t )const; |
132 | 133 | ||
133 | /** | 134 | /** |
135 | * Returns the element with given uid out of the cache. | ||
136 | * Returns empty element if nothing was found. | ||
137 | * <b>Attention:</b> This just works if we have a frontend which contains the cache ! | ||
138 | */ | ||
139 | T cacheFind( int uid ) const; | ||
140 | |||
141 | /** | ||
134 | * use a prime number here! | 142 | * use a prime number here! |
135 | */ | 143 | */ |
136 | void setSaneCacheSize( int ); | 144 | void setSaneCacheSize( int ); |
137 | 145 | ||
138 | uint readAhead()const; | 146 | uint readAhead()const; |
139 | 147 | ||
@@ -161,20 +169,32 @@ void OPimAccessBackend<T>::setFrontend( Frontend* fr ) { | |||
161 | } | 169 | } |
162 | template <class T> | 170 | template <class T> |
163 | void OPimAccessBackend<T>::cache( const T& t )const { | 171 | void OPimAccessBackend<T>::cache( const T& t )const { |
164 | if (m_front ) | 172 | if (m_front ) |
165 | m_front->cache( t ); | 173 | m_front->cache( t ); |
166 | } | 174 | } |
175 | |||
176 | template <class T> | ||
177 | T OPimAccessBackend<T>::cacheFind( int uid )const { | ||
178 | if ( ! m_front ){ | ||
179 | qWarning ( "No frontend assigned ! Therefore we cannot access the cache to return the right element!" ); | ||
180 | return T(); | ||
181 | } | ||
182 | |||
183 | return m_front->cacheFind( uid ); | ||
184 | } | ||
185 | |||
167 | template <class T> | 186 | template <class T> |
168 | void OPimAccessBackend<T>::setSaneCacheSize( int size) { | 187 | void OPimAccessBackend<T>::setSaneCacheSize( int size) { |
169 | if (m_front ) | 188 | if (m_front ) |
170 | m_front->setSaneCacheSize( size ); | 189 | m_front->setSaneCacheSize( size ); |
171 | } | 190 | } |
172 | template <class T> | 191 | template <class T> |
173 | T OPimAccessBackend<T>::find( int uid, const QArray<int>&, | 192 | T OPimAccessBackend<T>::find( int uid, const QArray<int>&, |
174 | uint, typename Frontend::CacheDirection )const { | 193 | uint, typename Frontend::CacheDirection )const { |
194 | qDebug( "*** Lookahead feature not supported. Fallback to default find!" ); | ||
175 | return find( uid ); | 195 | return find( uid ); |
176 | } | 196 | } |
177 | template <class T> | 197 | template <class T> |
178 | void OPimAccessBackend<T>::setReadAhead( uint count ) { | 198 | void OPimAccessBackend<T>::setReadAhead( uint count ) { |
179 | m_read = count; | 199 | m_read = count; |
180 | } | 200 | } |