U1DB Qt/ QML

Merge lp://staging/~kalikiana/u1db-qt/wonderiousFields into lp://staging/u1db-qt

wonderiousFields
Merge into trunk

Proposed by Cris Dywan on 2014-02-24

Status:

Merged

Approved by:

Cris Dywan on 2014-03-10

Approved revision:

119

Merged at revision:

114

Proposed branch:

lp://staging/~kalikiana/u1db-qt/wonderiousFields

Merge into:

lp://staging/u1db-qt

Diff against target:

525 lines (+219/-135)

3 files modified

src/query.cpp (+66/-114)
src/query.h (+3/-1)
tests/tst_query.qml (+150/-20)

To merge this branch:

bzr merge lp://staging/~kalikiana/u1db-qt/wonderiousFields

Related bugs:

Bug #1214538: Not indexing documents unless all fields are in the index expression clause	Critical	Fix Committed
Bug #1215898: Strange behaviour with multiple elements on first level in contents	High	Fix Committed
Bug #1284194: Wonderious fields constellation gets ignored	Critical	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Benjamin Zeller		2014-02-24	Approve on 2014-03-10
PS Jenkins bot	continuous-integration		Approve on 2014-03-07
Review via email: mp+207968@code.staging.launchpad.net

Commit message

Reverse query logic to check non-matching and internally convert between query syntaxes

Description of the change

- bug 1215898 example works
- bug 1214538 was already fixed before it seems
- bug 1284194 works

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-03:

PASSED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/u1db-qt-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-precise-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-saucy-amd64-ci/43
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/u1db-qt-trusty-armhf-ci/21

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/u1db-qt-ci/41/rebuild

review: Approve (continuous-integration)

Revision history for this message

Nekhelesh Ramananthan (nik90) wrote on 2014-03-03:

On testing, I found the following results,
1. bug #1214538 is fixed
2. bug #1284194 doesn't work with 2 Queries. With 1 Query, the filtering of elements with "show" works as expected.