author | zecke <zecke> | 2002-10-10 20:16:15 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-10-10 20:16:15 (UTC) |
commit | 48b06312289a90ad38278d3adb0bce5e9e0bd67e (patch) (unidiff) | |
tree | e5123b76d501eeb669ac6b43b8da746eae36e638 /libopie/pim | |
parent | c90676c42c7be606a9fc690278b67909ba6a9c99 (diff) | |
download | opie-48b06312289a90ad38278d3adb0bce5e9e0bd67e.zip opie-48b06312289a90ad38278d3adb0bce5e9e0bd67e.tar.gz opie-48b06312289a90ad38278d3adb0bce5e9e0bd67e.tar.bz2 |
Implement read ahead on the XML resource...
Scrolling is now noticeable faster with 10.000 items
but not as fast the XML backend...
OPimCache can be tuned and Query->OTodo too
-rw-r--r-- | libopie/pim/opimcache.h | 4 | ||||
-rw-r--r-- | libopie/pim/otodoaccesssql.cpp | 81 | ||||
-rw-r--r-- | libopie/pim/otodoaccesssql.h | 3 |
3 files changed, 81 insertions, 7 deletions
diff --git a/libopie/pim/opimcache.h b/libopie/pim/opimcache.h index 067f6e7..839550c 100644 --- a/libopie/pim/opimcache.h +++ b/libopie/pim/opimcache.h | |||
@@ -56,17 +56,19 @@ T OPimCacheItem<T>::record()const { | |||
56 | return m_t; | 56 | return m_t; |
57 | } | 57 | } |
58 | template <class T> | 58 | template <class T> |
59 | void OPimCacheItem<T>::setRecord( const T& t ) { | 59 | void OPimCacheItem<T>::setRecord( const T& t ) { |
60 | m_t = t; | 60 | m_t = t; |
61 | } | 61 | } |
62 | // Cache | 62 | // Cache |
63 | template <class T> | 63 | template <class T> |
64 | OPimCache<T>::OPimCache() { | 64 | OPimCache<T>::OPimCache() |
65 | : m_cache(100, 53 ) | ||
66 | { | ||
65 | m_cache.setAutoDelete( TRUE ); | 67 | m_cache.setAutoDelete( TRUE ); |
66 | } | 68 | } |
67 | template <class T> | 69 | template <class T> |
68 | OPimCache<T>::~OPimCache() { | 70 | OPimCache<T>::~OPimCache() { |
69 | 71 | ||
70 | } | 72 | } |
71 | template <class T> | 73 | template <class T> |
72 | bool OPimCache<T>::contains(int uid )const { | 74 | bool OPimCache<T>::contains(int uid )const { |
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp index 8add9f7..a059dab 100644 --- a/libopie/pim/otodoaccesssql.cpp +++ b/libopie/pim/otodoaccesssql.cpp | |||
@@ -76,19 +76,23 @@ namespace { | |||
76 | }; | 76 | }; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * a find query | 79 | * a find query |
80 | */ | 80 | */ |
81 | class FindQuery : public OSQLQuery { | 81 | class FindQuery : public OSQLQuery { |
82 | public: | 82 | public: |
83 | FindQuery(int uid); | 83 | FindQuery(int uid); |
84 | FindQuery(const QArray<int>& ); | ||
84 | ~FindQuery(); | 85 | ~FindQuery(); |
85 | QString query()const; | 86 | QString query()const; |
86 | private: | 87 | private: |
88 | QString single()const; | ||
89 | QString multi()const; | ||
90 | QArray<int> m_uids; | ||
87 | int m_uid; | 91 | int m_uid; |
88 | }; | 92 | }; |
89 | 93 | ||
90 | /** | 94 | /** |
91 | * overdue query | 95 | * overdue query |
92 | */ | 96 | */ |
93 | class OverDueQuery : public OSQLQuery { | 97 | class OverDueQuery : public OSQLQuery { |
94 | public: | 98 | public: |
@@ -133,16 +137,17 @@ namespace { | |||
133 | } | 137 | } |
134 | InsertQuery::~InsertQuery() { | 138 | InsertQuery::~InsertQuery() { |
135 | } | 139 | } |
136 | /* | 140 | /* |
137 | * converts from a OTodo to a query | 141 | * converts from a OTodo to a query |
138 | * we leave out X-Ref + Alarms | 142 | * we leave out X-Ref + Alarms |
139 | */ | 143 | */ |
140 | QString InsertQuery::query()const{ | 144 | QString InsertQuery::query()const{ |
145 | |||
141 | int year, month, day; | 146 | int year, month, day; |
142 | year = month = day = 0; | 147 | year = month = day = 0; |
143 | if (m_todo.hasDueDate() ) { | 148 | if (m_todo.hasDueDate() ) { |
144 | QDate date = m_todo.dueDate(); | 149 | QDate date = m_todo.dueDate(); |
145 | year = date.year(); | 150 | year = date.year(); |
146 | month = date.month(); | 151 | month = date.month(); |
147 | day = date.day(); | 152 | day = date.day(); |
148 | } | 153 | } |
@@ -170,23 +175,41 @@ namespace { | |||
170 | ClearQuery::~ClearQuery() {} | 175 | ClearQuery::~ClearQuery() {} |
171 | QString ClearQuery::query()const { | 176 | QString ClearQuery::query()const { |
172 | QString qu = "drop table todolist"; | 177 | QString qu = "drop table todolist"; |
173 | return qu; | 178 | return qu; |
174 | } | 179 | } |
175 | FindQuery::FindQuery(int uid) | 180 | FindQuery::FindQuery(int uid) |
176 | : OSQLQuery(), m_uid(uid ) { | 181 | : OSQLQuery(), m_uid(uid ) { |
177 | } | 182 | } |
183 | FindQuery::FindQuery(const QArray<int>& ints) | ||
184 | : OSQLQuery(), m_uids(ints){ | ||
185 | } | ||
178 | FindQuery::~FindQuery() { | 186 | FindQuery::~FindQuery() { |
179 | } | 187 | } |
180 | QString FindQuery::query()const{ | 188 | QString FindQuery::query()const{ |
189 | if (m_uids.count() == 0 ) | ||
190 | return single(); | ||
191 | else | ||
192 | return multi(); | ||
193 | } | ||
194 | QString FindQuery::single()const{ | ||
181 | QString qu = "select uid, categories, completed, progress, summary, "; | 195 | QString qu = "select uid, categories, completed, progress, summary, "; |
182 | qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid); | 196 | qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid); |
183 | return qu; | 197 | return qu; |
184 | } | 198 | } |
199 | QString FindQuery::multi()const { | ||
200 | QString qu = "select uid, categories, completed, progress, summary, "; | ||
201 | qu += "DueDate, priority, description from todolist where "; | ||
202 | for (uint i = 0; i < m_uids.count(); i++ ) { | ||
203 | qu += " UID = " + QString::number( m_uids[i] ) + " OR"; | ||
204 | } | ||
205 | qu.remove( qu.length()-2, 2 ); | ||
206 | return qu; | ||
207 | } | ||
185 | 208 | ||
186 | OverDueQuery::OverDueQuery(): OSQLQuery() {} | 209 | OverDueQuery::OverDueQuery(): OSQLQuery() {} |
187 | OverDueQuery::~OverDueQuery() {} | 210 | OverDueQuery::~OverDueQuery() {} |
188 | QString OverDueQuery::query()const { | 211 | QString OverDueQuery::query()const { |
189 | QDate date = QDate::currentDate(); | 212 | QDate date = QDate::currentDate(); |
190 | QString str; | 213 | QString str; |
191 | str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() ); | 214 | str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() ); |
192 | 215 | ||
@@ -256,16 +279,49 @@ QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int ){ | |||
256 | QArray<int> ints(0); | 279 | QArray<int> ints(0); |
257 | return ints; | 280 | return ints; |
258 | } | 281 | } |
259 | OTodo OTodoAccessBackendSQL::find(int uid ) const{ | 282 | OTodo OTodoAccessBackendSQL::find(int uid ) const{ |
260 | FindQuery query( uid ); | 283 | FindQuery query( uid ); |
261 | return todo( m_driver->query(&query) ); | 284 | return todo( m_driver->query(&query) ); |
262 | 285 | ||
263 | } | 286 | } |
287 | OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints, | ||
288 | uint cur, Frontend::CacheDirection dir ) const{ | ||
289 | qWarning("searching for %d", uid ); | ||
290 | QArray<int> search( 8 ); | ||
291 | uint size =0; | ||
292 | OTodo to; | ||
293 | |||
294 | // we try to cache 8 items | ||
295 | switch( dir ) { | ||
296 | /* forward */ | ||
297 | case 0: | ||
298 | for (uint i = cur; i < ints.count() && size < 8; i++ ) { | ||
299 | qWarning("size %d %d", size, ints[i] ); | ||
300 | search[size] = ints[i]; | ||
301 | size++; | ||
302 | } | ||
303 | break; | ||
304 | /* reverse */ | ||
305 | case 1: | ||
306 | for (uint i = cur; i >= 0 && size < 8; i-- ) { | ||
307 | search[size] = ints[i]; | ||
308 | size++; | ||
309 | } | ||
310 | break; | ||
311 | } | ||
312 | search.resize( size ); | ||
313 | FindQuery query( search ); | ||
314 | OSQLResult res = m_driver->query( &query ); | ||
315 | if ( res.state() != OSQLResult::Success ) | ||
316 | return to; | ||
317 | |||
318 | return todo( res ); | ||
319 | } | ||
264 | void OTodoAccessBackendSQL::clear() { | 320 | void OTodoAccessBackendSQL::clear() { |
265 | ClearQuery cle; | 321 | ClearQuery cle; |
266 | OSQLResult res = m_driver->query( &cle ); | 322 | OSQLResult res = m_driver->query( &cle ); |
267 | CreateQuery qu; | 323 | CreateQuery qu; |
268 | res = m_driver->query(&qu); | 324 | res = m_driver->query(&qu); |
269 | } | 325 | } |
270 | bool OTodoAccessBackendSQL::add( const OTodo& t) { | 326 | bool OTodoAccessBackendSQL::add( const OTodo& t) { |
271 | InsertQuery ins( t ); | 327 | InsertQuery ins( t ); |
@@ -388,24 +444,37 @@ bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ | |||
388 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ | 444 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ |
389 | if ( res.state() == OSQLResult::Failure ) { | 445 | if ( res.state() == OSQLResult::Failure ) { |
390 | OTodo to; | 446 | OTodo to; |
391 | return to; | 447 | return to; |
392 | } | 448 | } |
393 | 449 | ||
394 | OSQLResultItem::ValueList list = res.results(); | 450 | OSQLResultItem::ValueList list = res.results(); |
395 | OSQLResultItem::ValueList::Iterator it = list.begin(); | 451 | OSQLResultItem::ValueList::Iterator it = list.begin(); |
396 | 452 | qWarning("todo1"); | |
453 | OTodo to = todo( (*it) ); | ||
454 | cache( to ); | ||
455 | ++it; | ||
456 | |||
457 | for ( ; it != list.end(); ++it ) { | ||
458 | qWarning("caching"); | ||
459 | cache( todo( (*it) ) ); | ||
460 | } | ||
461 | return to; | ||
462 | } | ||
463 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { | ||
464 | qWarning("todo"); | ||
397 | bool has = false; QDate da = QDate::currentDate(); | 465 | bool has = false; QDate da = QDate::currentDate(); |
398 | has = date( da, (*it).data("DueDate") ); | 466 | has = date( da, item.data("DueDate") ); |
399 | QStringList cats = QStringList::split(";", (*it).data("categories") ); | 467 | QStringList cats = QStringList::split(";", item.data("categories") ); |
400 | 468 | ||
401 | OTodo to( (bool)(*it).data("completed").toInt(), (*it).data("priority").toInt(), | 469 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), |
402 | cats, (*it).data("summary"), (*it).data("description"), | 470 | cats, item.data("summary"), item.data("description"), |
403 | (*it).data("progress").toUShort(), has, da, (*it).data("uid").toInt() ); | 471 | item.data("progress").toUShort(), has, da, |
472 | item.data("uid").toInt() ); | ||
404 | return to; | 473 | return to; |
405 | } | 474 | } |
406 | OTodo OTodoAccessBackendSQL::todo( int uid )const { | 475 | OTodo OTodoAccessBackendSQL::todo( int uid )const { |
407 | FindQuery find( uid ); | 476 | FindQuery find( uid ); |
408 | return todo( m_driver->query(&find) ); | 477 | return todo( m_driver->query(&find) ); |
409 | } | 478 | } |
410 | /* | 479 | /* |
411 | * update the dict | 480 | * update the dict |
diff --git a/libopie/pim/otodoaccesssql.h b/libopie/pim/otodoaccesssql.h index 6c5f50a..c1aa2ed 100644 --- a/libopie/pim/otodoaccesssql.h +++ b/libopie/pim/otodoaccesssql.h | |||
@@ -2,43 +2,46 @@ | |||
2 | #define OPIE_PIM_ACCESS_SQL_H | 2 | #define OPIE_PIM_ACCESS_SQL_H |
3 | 3 | ||
4 | #include <qasciidict.h> | 4 | #include <qasciidict.h> |
5 | 5 | ||
6 | #include "otodoaccessbackend.h" | 6 | #include "otodoaccessbackend.h" |
7 | 7 | ||
8 | class OSQLDriver; | 8 | class OSQLDriver; |
9 | class OSQLResult; | 9 | class OSQLResult; |
10 | class OSQLResultItem; | ||
10 | class OTodoAccessBackendSQL : public OTodoAccessBackend { | 11 | class OTodoAccessBackendSQL : public OTodoAccessBackend { |
11 | public: | 12 | public: |
12 | OTodoAccessBackendSQL( const QString& file ); | 13 | OTodoAccessBackendSQL( const QString& file ); |
13 | ~OTodoAccessBackendSQL(); | 14 | ~OTodoAccessBackendSQL(); |
14 | 15 | ||
15 | bool load(); | 16 | bool load(); |
16 | bool reload(); | 17 | bool reload(); |
17 | bool save(); | 18 | bool save(); |
18 | QArray<int> allRecords()const; | 19 | QArray<int> allRecords()const; |
19 | 20 | ||
20 | QArray<int> queryByExample( const OTodo& t, int sort ); | 21 | QArray<int> queryByExample( const OTodo& t, int sort ); |
21 | OTodo find(int uid)const; | 22 | OTodo find(int uid)const; |
23 | OTodo find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const; | ||
22 | void clear(); | 24 | void clear(); |
23 | bool add( const OTodo& t ); | 25 | bool add( const OTodo& t ); |
24 | bool remove( int uid ); | 26 | bool remove( int uid ); |
25 | bool replace( const OTodo& t ); | 27 | bool replace( const OTodo& t ); |
26 | 28 | ||
27 | QArray<int> overDue(); | 29 | QArray<int> overDue(); |
28 | QArray<int> effectiveToDos( const QDate& start, | 30 | QArray<int> effectiveToDos( const QDate& start, |
29 | const QDate& end, bool includeNoDates ); | 31 | const QDate& end, bool includeNoDates ); |
30 | QArray<int> sorted(bool asc, int sortOrder, int sortFilter, int cat ); | 32 | QArray<int> sorted(bool asc, int sortOrder, int sortFilter, int cat ); |
31 | 33 | ||
32 | private: | 34 | private: |
33 | void update(); | 35 | void update(); |
34 | void fillDict(); | 36 | void fillDict(); |
35 | inline bool date( QDate& date, const QString& )const; | 37 | inline bool date( QDate& date, const QString& )const; |
36 | inline OTodo todo( const OSQLResult& )const; | 38 | inline OTodo todo( const OSQLResult& )const; |
39 | inline OTodo todo( OSQLResultItem& )const; | ||
37 | inline QArray<int> uids( const OSQLResult& )const; | 40 | inline QArray<int> uids( const OSQLResult& )const; |
38 | OTodo todo( int uid )const; | 41 | OTodo todo( int uid )const; |
39 | 42 | ||
40 | QAsciiDict<int> m_dict; | 43 | QAsciiDict<int> m_dict; |
41 | OSQLDriver* m_driver; | 44 | OSQLDriver* m_driver; |
42 | QArray<int> m_uids; | 45 | QArray<int> m_uids; |
43 | }; | 46 | }; |
44 | 47 | ||