Merge lp:~uonedb-qt/u1db-qt/ordering2 into lp:u1db-qt

[Cris Dywan]

Unit test query bugs related to the ordering of fields

Unmerged revisions

107. By Cris Dywan on 2013-09-06

Failed attempt to fix ordering (WIP)

=== modified file 'src/index.cpp'
--- src/index.cpp	2013-08-08 10:31:16 +0000
+++ src/index.cpp	2013-09-06 16:57:59 +0000
@@ -175,6 +175,9 @@
         Q_FOREACH (QString docId, documents){
 
             QVariant document = db->getDocUnchecked(docId);
+            // Skip empty aka deleted docs
+            if (!document.isValid())
+                continue;
 
             QStringList fieldsList;
 
@@ -244,7 +247,7 @@
         }
     }
 
-    if(results_map.count()>0){
+    if(true){
         QVariantMap mapIdResult;
         mapIdResult.insert("docId", docId);
         mapIdResult.insert("result", results_map);

=== modified file 'src/query.cpp'
--- src/query.cpp	2013-08-27 10:49:26 +0000
+++ src/query.cpp	2013-09-06 16:57:59 +0000
@@ -144,8 +144,8 @@
         }
 
         if(match == true){
-            // Results must be unique and not empty aka deleted
-            if (!m_documents.contains(docId) && result_variant.isValid())
+            // Results must be unique
+            if (!m_documents.contains(docId) && result.count()>0)
             {
                 m_documents.append(docId);
                 m_results.append(result);

=== modified file 'tests/tst_query.qml'
--- tests/tst_query.qml	2013-08-27 10:49:26 +0000
+++ tests/tst_query.qml	2013-09-06 16:57:59 +0000
@@ -120,6 +120,55 @@
         query: [{ 'name': 'Ivanka', 'phone': '*' }]
     }
 
+    U1db.Database {
+        id: tokusatsu
+    }
+
+    U1db.Document {
+        database: tokusatsu
+        docId: 'ooo'
+        contents: { 'series': 'ooo', 'type': 'rider' }
+    }
+
+    U1db.Document {
+        database: tokusatsu
+        docId: 'gokaiger'
+        contents: { 'series': 'gokaiger', 'type': 'sentai' }
+    }
+
+    U1db.Document {
+        id: tokusatsuDocumentWizard
+        docId: 'wizard'
+        contents: { 'series': 'wizard', 'type': 'rider',
+                    'transformations': ['Flame Style','Water Style'] }
+    }
+
+    U1db.Document {
+        id: tokusatsuDocumentDino
+        docId: 'dino'
+        contents: { 'series': 'zyuranger', 'scarf': false, 'type': 'sentai',
+                    'beasts': ['T-Rex', 'Mastodon'] }
+    }
+
+    U1db.Index {
+        id: bySeries
+        database: tokusatsu
+        name: 'by-series'
+        expression: ['series', 'type']
+    }
+
+    U1db.Query {
+        id: allHeroesWithType
+        index: bySeries
+        query: [{ 'series': '*' }, { 'type': '*' }]
+    }
+
+    U1db.Query {
+        id: allHeroesSeriesOnly
+        index: bySeries
+        query: [{ 'series': '*' }]
+    }
+
     SignalSpy {
         id: spyDocumentsChanged
         target: defaultPhone
@@ -163,6 +212,8 @@
 
     function test_2_numbers () {
         // We should get '1'
+        if(s12345Phone.documents != ['1'])
+            console.log('uno: ' + JSON.stringify(s12345Phone.documents))
         compare(s12345Phone.documents, ['1'], 'uno')
         // It's okay to mix strings and numerical values
         compare(s12345Phone.documents, i12345Phone.documents, 'dos')
@@ -180,11 +231,39 @@
     }
 
     function test_4_delete () {
+        // workaroundQueryAndWait(defaultPhone)
+        if(defaultPhone.documents != ['1', '_', 'a'])
+            console.log('uno: ' + JSON.stringify(defaultPhone.documents))
         compare(defaultPhone.documents, ['1', '_', 'a'], 'uno')
         // Deleted aka empty documents should not be returned
         gents.putDoc('', '_')
+        workaroundQueryAndWait(defaultPhone)
+        if(defaultPhone.documents != ['1', 'a'])
+            console.log('dos: ' + JSON.stringify(defaultPhone.documents))
         compare(defaultPhone.documents, ['1', 'a'], 'dos')
     }
 
+    function test_5_definition () {
+        workaroundQueryAndWait(allHeroesWithType)
+        compare(allHeroesWithType.documents, ['gokaiger', 'ooo'], 'ichi')
+        workaroundQueryAndWait(allHeroesSeriesOnly)
+        compare(allHeroesWithType.documents, allHeroesSeriesOnly.documents, 'ni')
+        // Add a document with extra fields
+        tokusatsu.putDoc(tokusatsuDocumentWizard.contents, tokusatsuDocumentWizard.docId)
+        workaroundQueryAndWait(allHeroesWithType)
+        compare(allHeroesWithType.documents, ['gokaiger', 'ooo', 'wizard'], 'san')
+        // workaroundQueryAndWait(allHeroesSeriesOnly)
+        compare(allHeroesWithType.documents, allHeroesSeriesOnly.documents, 'chi')
+        // Add a document with mixed custom fields
+        tokusatsu.putDoc(tokusatsuDocumentDino.contents, tokusatsuDocumentDino.docId)
+        workaroundQueryAndWait(allHeroesWithType)
+        console.log('allDocs: ' + JSON.stringify(tokusatsu.listDocs()))
+        if(allHeroesWithType.documents != ['dino', 'gokaiger', 'ooo', 'wizard'])
+            console.log('go: ' + JSON.stringify(allHeroesWithType.documents))
+        compare(allHeroesWithType.documents, ['dino', 'gokaiger', 'ooo', 'wizard'], 'go')
+        // workaroundQueryAndWait(allHeroesSeriesOnly)
+        compare(allHeroesWithType.documents, allHeroesSeriesOnly.documents, 'roku')
+    }
+
 } }