diff options
| author | Filipe David Borba Manana <fdmanana@apache.org> | 2011-02-10 08:11:01 +0000 |
|---|---|---|
| committer | Filipe David Borba Manana <fdmanana@apache.org> | 2011-02-10 08:11:01 +0000 |
| commit | 4158b51580cb27cbe143384f1ca41ac18c9ea0cb (patch) | |
| tree | d41d82e6f7c390a42aa3052dfbb5ff0c7888b1b0 /src/couchdb/couch_httpd_view.erl | |
| parent | 00d2709afbff6f402d91f5d1dc3e5a5075685c49 (diff) | |
Merged revision 1069262 from trunk
More efficient _changes?include_docs=true and _all_docs?include_docs=true
Closes COUCHDB-1061
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1069264 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_httpd_view.erl')
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index 8656c43e..8906de70 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -660,6 +660,14 @@ view_row_obj(_Db, {{Key, DocId}, Value}, _IncludeDocs) -> view_row_with_doc(Db, {{Key, DocId}, Value}, IdRev) -> {[{id, DocId}, {key, Key}, {value, Value}] ++ doc_member(Db, IdRev)}. +doc_member(Db, #doc_info{id = Id, revs = [#rev_info{rev = Rev} | _]} = Info) -> + ?LOG_DEBUG("Include Doc: ~p ~p", [Id, Rev]), + case couch_db:open_doc(Db, Info, [deleted]) of + {ok, Doc} -> + [{doc, couch_doc:to_json_obj(Doc, [])}]; + _ -> + [{doc, null}] + end; doc_member(Db, {DocId, Rev}) -> ?LOG_DEBUG("Include Doc: ~p ~p", [DocId, Rev]), case (catch couch_httpd_db:couch_doc_open(Db, DocId, Rev, [])) of |