You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by bb...@apache.org on 2014/10/31 20:53:21 UTC
[06/41] couch-mrview commit: updated refs/heads/master to 28e51f3
couch_mrview: add couch_mrview:count_view_changes_since/{4,5}
Add function to couch changes in a view index, similar to
couch_db:count_changes_since/2 .
Conflicts:
src/couch_mrview.erl
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/8185ca7a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/8185ca7a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/8185ca7a
Branch: refs/heads/master
Commit: 8185ca7af804c40f292960d8c3c9687af117c167
Parents: 19be43b
Author: benoitc <be...@apache.org>
Authored: Mon Jan 27 11:51:11 2014 +0100
Committer: Benjamin Bastian <be...@gmail.com>
Committed: Thu Oct 30 13:38:33 2014 -0700
----------------------------------------------------------------------
src/couch_mrview.erl | 33 +++++++++++++++++++++++++++++----
src/couch_mrview_util.erl | 8 ++++++--
2 files changed, 35 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/8185ca7a/src/couch_mrview.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl
index 343b91a..2f68fc0 100644
--- a/src/couch_mrview.erl
+++ b/src/couch_mrview.erl
@@ -16,6 +16,7 @@
-export([query_all_docs/2, query_all_docs/4]).
-export([query_view/3, query_view/4, query_view/6]).
-export([view_changes_since/6, view_changes_since/7]).
+-export([count_view_changes_since/4, count_view_changes_since/5]).
-export([get_info/2]).
-export([trigger_update/2, trigger_update/3]).
-export([compact/2, compact/3, cancel_compaction/2]).
@@ -160,10 +161,34 @@ view_changes_since(Db, DDoc, VName, StartSeq, Fun, Options, Acc) ->
{error, seqs_not_indexed}
end.
-get_info(Db, DDocId) when is_binary(DDocId) ->
- DbName = mem3:dbname(Db#db.name),
- {ok, DDoc} = ddoc_cache:open(DbName, DDocId),
- get_info(Db, DDoc);
+count_view_changes_since(Db, DDoc, VName, SinceSeq) ->
+ count_view_changes_since(Db, DDoc, VName, SinceSeq, []).
+
+count_view_changes_since(Db, DDoc, VName, SinceSeq, Options) ->
+ Args0 = make_view_changes_args(Options),
+ {ok, {_, View}, _, Args} = couch_mrview_util:get_view(Db, DDoc, VName,
+ Args0),
+ case View#mrview.seq_indexed of
+ true ->
+ OptList = make_view_changes_opts(SinceSeq, Options, Args),
+ Btree = case is_key_byseq(Options) of
+ true -> View#mrview.key_byseq_btree;
+ _ -> View#mrview.seq_btree
+ end,
+ lists:foldl(fun(Opts, Acc0) ->
+ {ok, N} = couch_btree:fold_reduce(
+ Btree, fun(_SeqStart, PartialReds, 0) ->
+ {ok, couch_btree:final_reduce(
+ Btree, PartialReds)}
+ end,
+ 0, Opts),
+ Acc0 + N
+ end, 0, OptList);
+ _ ->
+ {error, seqs_not_indexed}
+ end.
+
+
get_info(Db, DDoc) ->
{ok, Pid} = couch_index_server:get_index(couch_mrview_index, Db, DDoc),
couch_index:get_info(Pid).
http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/8185ca7a/src/couch_mrview_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_util.erl b/src/couch_mrview_util.erl
index cd25887..6d48ed0 100644
--- a/src/couch_mrview_util.erl
+++ b/src/couch_mrview_util.erl
@@ -244,7 +244,6 @@ less_json_seqs({SeqA, JsonA}, {SeqB, JsonB}) ->
Result < 0
end.
-
open_view(Db, Fd, Lang, {BTState, SeqBTState, KSeqBTState, USeq, PSeq}, View) ->
FunSrcs = [FunSrc || {_Name, FunSrc} <- View#mrview.reduce_funs],
ReduceFun =
@@ -273,10 +272,15 @@ open_view(Db, Fd, Lang, {BTState, SeqBTState, KSeqBTState, USeq, PSeq}, View) ->
{SeqBtree, KeyBySeqBtree} = case View#mrview.seq_indexed of
true ->
+ BySeqReduceFun = fun couch_db_updater:btree_by_seq_reduce/2,
ViewSeqBtOpts = [{less, fun less_json_seqs/2},
+ {reduce, BySeqReduceFun},
{compression, couch_db:compression(Db)}],
+ KeyBySeqBtOpts = [{less, Less},
+ {reduce, BySeqReduceFun},
+ {compression, couch_db:compression(Db)}],
{ok, SBt} = couch_btree:open(SeqBTState, Fd, ViewSeqBtOpts),
- {ok, KSBt} = couch_btree:open(KSeqBTState, Fd, ViewBtOpts),
+ {ok, KSBt} = couch_btree:open(KSeqBTState, Fd, KeyBySeqBtOpts),
{SBt, KSBt};
false ->
{nil, nil}