Merge lp://qastaging/~kalikiana/u1db-qt/entireContentsInQuery into lp://qastaging/u1db-qt
Status: | Merged |
---|---|
Approved by: | Cris Dywan |
Approved revision: | 110 |
Merged at revision: | 113 |
Proposed branch: | lp://qastaging/~kalikiana/u1db-qt/entireContentsInQuery |
Merge into: | lp://qastaging/u1db-qt |
Diff against target: |
25 lines (+3/-1) 2 files modified
src/query.cpp (+1/-1) tests/tst_query.qml (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~kalikiana/u1db-qt/entireContentsInQuery |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Approve | |
Benjamin Zeller | Approve | ||
Review via email:
|
Commit message
Store whole document contents in the results and unit test that
Description of the change
The original reason to avoid yielding all contents was in order to conserve memory. I pondered different approaches such as lazily loading the data in the model implementation. Ultimately this would make it more complicated and harder to test, so given the number of bugs I'm focussing on the easy, reliable solution. It can be optimized later.
Caveat: The results don't always have the same structure as the complete documents.
a) Bite the bullet (and maybe swallow it with Synchronizer goodness)
b) Find a heuristic to avoid the difference
c) Introduce a bool entireContents
d) Introduce Query.fields which can be * or desirable fields
e) Accept an extra * as desire for full contents
f) Bump import version to enable the changed behavior
FAILED: Continuous integration, rev:109 jenkins. qa.ubuntu. com/job/ u1db-qt- ci/29/ jenkins. qa.ubuntu. com/job/ u1db-qt- precise- amd64-ci/ 29 jenkins. qa.ubuntu. com/job/ u1db-qt- quantal- amd64-ci/ 29/console jenkins. qa.ubuntu. com/job/ u1db-qt- raring- amd64-ci/ 29 jenkins. qa.ubuntu. com/job/ u1db-qt- saucy-amd64- ci/31 jenkins. qa.ubuntu. com/job/ u1db-qt- trusty- amd64-ci/ 9 jenkins. qa.ubuntu. com/job/ u1db-qt- trusty- armhf-ci/ 9
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/u1db- qt-ci/29/ rebuild
http://