diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-01-21 14:05:07 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-01-21 14:05:07 +0000 |
| commit | 9ce71f36273bad1f48d0b117799ad8d682451258 (patch) | |
| tree | 2b84976aa8a5d94c04eae8671c6e1e4ad924c94c | |
| parent | 4aaadc75abce9a6d662b807df92989505cba4a49 (diff) | |
Merged revision 1061809 from trunk
Fix strange result when passing a filter and a limit of 1 to /db/_changes
Fixes COUCHDB-1037
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1061811 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | share/www/script/test/changes.js | 44 | ||||
| -rw-r--r-- | src/couchdb/couch_changes.erl | 2 |
2 files changed, 45 insertions, 1 deletions
diff --git a/share/www/script/test/changes.js b/share/www/script/test/changes.js index 7ce3baaa..5998f48c 100644 --- a/share/www/script/test/changes.js +++ b/share/www/script/test/changes.js @@ -461,5 +461,49 @@ couchTests.changes = function(debug) { }); + // COUCHDB-1037 - empty result for ?limit=1&filter=foo/bar in some cases + T(db.deleteDb()); + T(db.createDb()); + + ddoc = { + _id: "_design/testdocs", + filters: { + testdocsonly: (function(doc, req) { + return (typeof doc.integer === "number"); + }).toString() + } + }; + T(db.save(ddoc)); + + ddoc = { + _id: "_design/foobar", + foo: "bar" + }; + T(db.save(ddoc)); + + db.bulkSave(makeDocs(0, 5)); + + req = CouchDB.request("GET", "/" + db.name + "/_changes"); + resp = JSON.parse(req.responseText); + TEquals(7, resp.last_seq); + TEquals(7, resp.results.length); + + req = CouchDB.request( + "GET", "/"+ db.name + "/_changes?limit=1&filter=testdocs/testdocsonly"); + resp = JSON.parse(req.responseText); + TEquals(3, resp.last_seq); + TEquals(1, resp.results.length); + TEquals("0", resp.results[0].id); + + req = CouchDB.request( + "GET", "/" + db.name + "/_changes?limit=2&filter=testdocs/testdocsonly"); + resp = JSON.parse(req.responseText); + TEquals(4, resp.last_seq); + TEquals(2, resp.results.length); + TEquals("0", resp.results[0].id); + TEquals("1", resp.results[1].id); + + // cleanup + db.deleteDb(); }; diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl index 1e53161b..838f7e66 100644 --- a/src/couchdb/couch_changes.erl +++ b/src/couchdb/couch_changes.erl @@ -285,7 +285,7 @@ changes_enumerator(DocInfo, {Db, _, Prepend, FilterFun, Callback, UserAcc, = DocInfo, Results0 = FilterFun(DocInfo), Results = [Result || Result <- Results0, Result /= null], - Go = if Limit =< 1 -> stop; true -> ok end, + Go = if (Limit =< 1) andalso Results =/= [] -> stop; true -> ok end, case Results of [] -> {Go, {Db, Seq, Prepend, FilterFun, Callback, UserAcc, ResponseType, |