Merge lp:~boiko/calls-scope/optimize_queries into lp:calls-scope

[Gustavo Pichorim Boiko]

Optimize the queries by reusing existing results instead of fetching everything
every time.

Optimize the queries by reusing existing results instead of fetching everything
every time.

[lp:~boiko/calls-scope/optimize_queries]

41. By Gustavo Pichorim Boiko on 2015-10-16

Merge latest changes from parent branch.

42. By Gustavo Pichorim Boiko on 2015-10-16

Do case insensitive searching.

43. By Gustavo Pichorim Boiko on 2015-10-16

Merge parent changes.

[Kyle Nitzsche (knitzsche)]

MR comment might also have mentioned that this appears to use a new getEventsForDateRange api (that I requested :)

[Kyle Nitzsche (knitzsche)]

no, ignore that (me goes to get coffee ;)

=== modified file 'include/query.h'
--- include/query.h	2015-10-16 21:51:06 +0000
+++ include/query.h	2015-10-16 21:51:06 +0000
@@ -61,7 +61,7 @@
     unity::scopes::Category::SCPtr cat7;
     unity::scopes::Category::SCPtr cat30;
 
-    void getEventsForDateRange(QDate start, QDate end, History::EventViewPtr eView, History::Events &ev_l);
+    History::Events getEventsForDateRange(QDate start, QDate end, History::EventViewPtr eView, History::Events &ev_l);
     void processEvents(History::Events &ev_l);
     QList<unity::scopes::VariantArray> collapsedArrays_varr;
     QList<unity::scopes::VariantMap> collapsedMaps_varr;
 
=== modified file 'src/query.cpp'
--- src/query.cpp	2015-10-16 21:51:06 +0000
+++ src/query.cpp	2015-10-16 21:51:06 +0000
@@ -101,43 +101,80 @@
     return QString("<strong>%1</strong>").arg(str);
 }
 
-void Query::getEventsForDateRange(QDate start, QDate end, EventViewPtr eView, Events &ev_l)
+Events Query::getEventsForDateRange(QDate start, QDate end, EventViewPtr eView, Events &ev_l)
 {
-
+    // in order to optimize the parsing, this functions reuses the events that
+    // were previously retrieved and then if necessary, get extra events
     qDebug() << "=== calls in getEventsforDateRange";
     qDebug() << "=== calls  start: " << start;
     qDebug() << "=== calls end: " << end;
+    Events l_toadd;
     bool going = true;
     while (going){
         try {
-            Events l = eView->nextPage();
-            if (l.size() == 0)
-            {
-                qDebug() << "=== calls NO events left";
-                break;
-            }
-            //iterate list and if out of date range remove event
-            //if all out of date range stop getting more events
-            Events l_toadd;
-            Q_FOREACH(const Event &event, l) {
+            bool outOfBounds = false;
+            // start by parsing the existing events
+            Q_FOREACH(const Event &event, ev_l) {
                 QDate ev_date = event.timestamp().date();
+
+                // if the date is newer than the end date, keep searching
+                // as the results are sorted from newer to older
+                if (ev_date > end) {
+                    continue;
+                }
+
+                // now if the date is older than the end date, we are already
+                // out of bounds and can stop processing
                 if (ev_date < start) {
+                    outOfBounds = true;
                     break;
                 }
-                if (ev_date > end)
-                {
-                    continue;
-                }
+
+                // if we got here, we want the event
                 l_toadd.append(event);
             }
-            ev_l.append(l_toadd);
+
+            if (outOfBounds) {
+                break;
+            }
+
+            // now, if we didn't get out of bounds in the existing events,
+            // we might want to fetch some more to get the full list
+            outOfBounds = false;
+            while (!outOfBounds) {
+                Events l = eView->nextPage();
+
+                // append the events to the existing ones for the next query
+                ev_l.append(l);
+
+                // and process them too
+                Q_FOREACH(const Event &event, ev_l) {
+                    QDate ev_date = event.timestamp().date();
+
+                    // if the date is newer than the end date, keep searching
+                    // as the results are sorted from newer to older
+                    if (ev_date > end) {
+                        continue;
+                    }
+
+                    // now if the date is older than the end date, we are already
+                    // out of bounds and can stop processing
+                    if (ev_date < start) {
+                        outOfBounds = true;
+                        break;
+                    }
+
+                    // if we got here, we want the event
+                    l_toadd.append(event);
+                }
+            }
         }
         catch (std::exception &e){
             qDebug() << "=== calls exception caught";
             break; // just to be sure
         }
     }
-    return;
+    return l_toadd;
 }
 
 void Query::processEvents(Events &ev_l)
@@ -358,10 +395,9 @@
     EventViewPtr eView = manager->queryEvents(EventType::EventTypeVoice, sort);
 
     Events ev_l;
-    getEventsForDateRange(today, today, eView, ev_l);
-    processEvents(ev_l);
+    Events filtered = getEventsForDateRange(today, today, eView, ev_l);
+    processEvents(filtered);
 
-    bool going = true;
     bool agged = false;
     if (search_metadata().is_aggregated())
     {
@@ -427,14 +463,12 @@
         else
             Query::pushReplies(vevents1, id_collEvs1, reply);
 
-        eView = manager->queryEvents(EventType::EventTypeVoice, sort);
-        getEventsForDateRange(sevenDaysStart, sevenDaysEnd, eView, ev_l);
-        processEvents(ev_l);
+        filtered = getEventsForDateRange(sevenDaysStart, sevenDaysEnd, eView, ev_l);
+        processEvents(filtered);
         Query::pushReplies(vevents7, id_collEvs7, reply);
 
-        eView = manager->queryEvents(EventType::EventTypeVoice, sort);
-        getEventsForDateRange(thirtyDaysStart, thirtyDaysEnd, eView, ev_l);
-        processEvents(ev_l);
+        filtered = getEventsForDateRange(thirtyDaysStart, thirtyDaysEnd, eView, ev_l);
+        processEvents(filtered);
         Query::pushReplies(vevents30, id_collEvs30, reply);
     }
 }