You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/10 21:05:40 UTC
[40/50] couch commit: updated refs/remotes/origin/import to 09c6556
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/295602b8
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/295602b8
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/295602b8
Branch: refs/remotes/origin/import
Commit: 295602b8b9347fe6e3cd315311088a15dc1e169d
Parents: 6c8c480
Author: Robert Newson <rn...@apache.org>
Authored: Mon Dec 23 11:44:52 2013 +0000
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Feb 4 17:03:53 2014 -0600
----------------------------------------------------------------------
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/295602b8/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/295602b8/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) ->