Merge lp:~kevin-wright-1/u1db-qt/query-april-18-2013-i into lp:u1db-qt

[Kevin Wright]

Modified Query to support the querying functionality. In order to support proper querying on QVariantMaps a property 'queries' was added to Query. The property is a list that includes key value pairs matching a field/sub-field with a query statement. Example: queries: [{"id":"*"},{"message":"Hel*"}]. Query supports exact match and wild cards (i.e. *). Additionaly added a queries definition to the Query element in examples/u1db-qt-example-5/u1db-qt-example-5.qml, but includes a not that the property is proposed. The 'queries' property would replace the 'query' property (which does not support query on QVariantMaps).

Modified Query to support the querying functionality. In order to support proper querying on QVariantMaps a property 'queries' was added to Query. The property is a list that includes key value pairs matching a field/sub-field with a query statement. Example: queries: [{"id":"*"},{"message":"Hel*"}]. Query supports exact match and wild cards (i.e. *). Additionaly added a queries definition to the Query element in examples/u1db-qt-example-5/u1db-qt-example-5.qml, but includes a not that the property is proposed. The 'queries' property would replace the 'query' property (which does not support query on QVariantMaps).

[lp:~kevin-wright-1/u1db-qt/query-april-18-2013-i]

73. By Kevin Wright on 2013-04-18

Modified Query to update the proposed new querying functionality. The new modification fixes a bug where an else clause was returning incorrect results. The clause was changed to an if else to check for the existance of the wildcard first and then the proper boolean value determined after that. Additionally changed the surrounding function to default to return false if none of the checks are true (previously it was set to true).

74. By Kevin Wright on 2013-04-18

Modified Query to split up the querying functionality across more reasonable and intuitive methods. Additionally changed some method names and variable names to be more intuitive (e.g. checkMapMatch to queryField)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:74
http://91.189.93.125:8080/job/u1db-qt-ci/2/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/2
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/2

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/2/rebuild

review: Approve (continuous-integration)

=== modified file 'examples/u1db-qt-example-5/u1db-qt-example-5.qml'
--- examples/u1db-qt-example-5/u1db-qt-example-5.qml	2013-04-12 07:53:54 +0000
+++ examples/u1db-qt-example-5/u1db-qt-example-5.qml	2013-04-18 09:23:51 +0000
@@ -80,7 +80,7 @@
        U1db.Query{
            id: aQuery
            index: by_helloworld
-           //query: "*" /* Note: The 'query' property is not currently suupported */
+           queries: [{"id":"*"},{"message":"Hel*"}] /* Note: The 'queries' property is a proposed feature */
        }
 
     MainView {

=== modified file 'src/query.cpp'
--- src/query.cpp	2013-04-12 12:26:52 +0000
+++ src/query.cpp	2013-04-18 09:23:51 +0000
@@ -117,6 +117,13 @@
         }
     }
 
+    generateQueryResults();
+
+}
+
+void Query::generateQueryResults()
+{
+
     m_index->clearResults();
 
     m_index->generateIndexResults();
@@ -124,9 +131,74 @@
     QListIterator<QVariantMap> i(m_index->getAllResults());
 
     while (i.hasNext()) {
-        QVariantMap result = i.next();
-        m_hash.insert(m_hash.count(),result);
-    }
+
+        QVariantMap i_map = i.next();
+
+        QMapIterator<QString,QVariant> j(i_map);
+
+        bool match = true;
+
+        while(j.hasNext()){
+            j.next();
+
+            if(queryField(j.key(), j.value()) == false){
+                match = false;
+            }
+        }
+
+        if(match == true){
+            m_hash.insert(m_hash.count(),i_map);
+        }
+
+    }
+
+}
+
+bool Query::queryField(QString field, QVariant value){
+
+    bool match = false;
+
+    QString value_string = value.toString();
+    QVariant queries = getQueries();
+    QList<QVariant> query_list = queries.toList();
+    QListIterator<QVariant> j(query_list);
+
+    while (j.hasNext()) {
+
+        QVariant j_value = j.next();
+        QVariantMap value_map = j_value.toMap();
+        QMapIterator<QString,QVariant> k(value_map);
+
+        while(k.hasNext()){
+            k.next();
+
+            QString k_key = k.key();
+            QVariant k_variant = k.value();
+            QString query = k_variant.toString();
+
+            if(field == k_key){
+                if(query == "*"){
+                    return true;
+                }
+                else if(query == value_string){
+                    return true;
+                }
+                else if(query.contains("*")){
+
+                    QStringList k_string_list = query.split("*");
+                    QString k_string = k_string_list[0];
+                    match = value_string.startsWith(k_string,Qt::CaseSensitive);
+
+                    return match;
+
+                }
+
+            }
+        }
+
+    }
+
+    return match;
 
 }
 
@@ -160,6 +232,11 @@
     return m_query;
 }
 
+QVariant Query::getQueries()
+{
+    return m_queries;
+}
+
 /*!
     Sets a range, such as ['match', false].
     Only one of query and range is used - setting range unsets the query.
@@ -178,6 +255,21 @@
     onDataInvalidated();
 }
 
+
+void
+Query::setQueries(QVariant queries)
+{
+    if (m_queries == queries)
+        return;
+
+    if (m_range.isValid())
+        m_range = QVariant();
+
+    m_queries = queries;
+    Q_EMIT queriesChanged(queries);
+    onDataInvalidated();
+}
+
 QVariant
 Query::getRange()
 {

=== modified file 'src/query.h'
--- src/query.h	2013-04-12 12:26:52 +0000
+++ src/query.h	2013-04-18 09:23:51 +0000
@@ -35,6 +35,7 @@
     Q_PROPERTY(QT_PREPEND_NAMESPACE_U1DB(Index*) index READ getIndex WRITE setIndex NOTIFY indexChanged)
 #endif
     Q_PROPERTY(QVariant query READ getQuery WRITE setQuery NOTIFY queryChanged)
+    Q_PROPERTY(QVariant queries READ getQueries WRITE setQueries NOTIFY queriesChanged)
     Q_PROPERTY(QVariant range READ getRange WRITE setRange NOTIFY rangeChanged)
 public:
     Query(QObject* parent = 0);
@@ -49,17 +50,25 @@
     void setIndex(Index* index);
     QVariant getQuery();
     void setQuery(QVariant query);
+    QVariant  getQueries();
+    void setQueries(QVariant queries);
     QVariant getRange();
     void setRange(QVariant range);
+
+    void generateQueryResults();
+    bool queryField(QString field, QVariant value);
+
 Q_SIGNALS:
     void indexChanged(Index* index);
     void queryChanged(QVariant query);
+    void queriesChanged(QVariant queries);
     void rangeChanged(QVariant range);
 private:
     Q_DISABLE_COPY(Query)
     Index* m_index;
     QHash<int, QVariantMap> m_hash;
     QVariant m_query;
+    QVariant m_queries;
     QVariant m_range;
 
     void onDataInvalidated();