Purge view_query_args and point to mrargs (when rebasing, pull in the other bits from ba152cb2153e892c0d8eec7f6fbeecf3dcaff10a)
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/40777d97 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/40777d97 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/40777d97 Branch: refs/heads/import Commit: 40777d97c3eb81f1fe0723af0aa93a4970d8eafa Parents: bac9e82 Author: Robert Newson <[email protected]> Authored: Mon Dec 23 11:44:52 2013 +0000 Committer: Paul J. Davis <[email protected]> Committed: Fri Jan 17 16:44:44 2014 -0800 ---------------------------------------------------------------------- include/couch_db.hrl | 26 -------------------------- src/couch_db.erl | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/40777d97/include/couch_db.hrl ---------------------------------------------------------------------- diff --git a/include/couch_db.hrl b/include/couch_db.hrl index 61a59f7..ffecae0 100644 --- a/include/couch_db.hrl +++ b/include/couch_db.hrl @@ -179,32 +179,6 @@ after_doc_read = nil % nil | fun(Doc, Db) -> NewDoc }). - --record(view_query_args, { - start_key, - end_key, - start_docid = ?MIN_STR, - end_docid = ?MAX_STR, - - direction = fwd, - inclusive_end=true, % aka a closed-interval - - limit = 10000000000, % Huge number to simplify logic - skip = 0, - - group_level = 0, - - view_type = nil, - include_docs = false, - conflicts = false, - stale = false, - multi_get = false, - callback = nil, - list = nil, - keys = nil, - sorted = true -}). - -record(view_fold_helper_funs, { reduce_count, passed_end, http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/40777d97/src/couch_db.erl ---------------------------------------------------------------------- diff --git a/src/couch_db.erl b/src/couch_db.erl index e4e8cca..32a0049 100644 --- a/src/couch_db.erl +++ b/src/couch_db.erl @@ -291,7 +291,7 @@ get_last_purged(#db{fd=Fd, header=#db_header{purged_docs=PurgedPointer}}) -> couch_file:pread_term(Fd, PurgedPointer). get_doc_count(Db) -> - {ok, {Count, _DelCount}} = couch_btree:full_reduce(Db#db.id_tree), + {ok, {Count, _, _}} = couch_btree:full_reduce(Db#db.id_tree), {ok, Count}. get_db_info(Db) ->
