You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/28 14:21:20 UTC
[45/50] fabric commit: updated refs/heads/master to a71701c
Fix merge of new changes behaviors
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/094ce20f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/094ce20f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/094ce20f
Branch: refs/heads/master
Commit: 094ce20f6a6e061942061439ed6c2e79213589f1
Parents: defcefd
Author: Paul J. Davis <pa...@gmail.com>
Authored: Wed Aug 13 16:25:40 2014 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Aug 13 16:25:40 2014 -0500
----------------------------------------------------------------------
src/fabric_rpc.erl | 2 +-
src/fabric_view_changes.erl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/094ce20f/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index 3df0064..fd5b3a7 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -327,7 +327,7 @@ changes_enumerator(#doc_info{id= <<"_local/", _/binary>>, high_seq=Seq}, Acc) ->
changes_enumerator(DocInfo, Acc) ->
#cacc{
db = Db,
- args = #changes_args{include_docs = IncludeDocs, filter = Filter},
+ args = #changes_args{include_docs = IncludeDocs, filter_fun = Filter},
options = Options,
pending = Pending,
epochs = Epochs
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/094ce20f/src/fabric_view_changes.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl
index 44639d9..c166190 100644
--- a/src/fabric_view_changes.erl
+++ b/src/fabric_view_changes.erl
@@ -332,8 +332,8 @@ maybe_stop(#collector{offset = Offset} = State) ->
{ok, State}
end.
-make_changes_args(#changes_args{style=Style, filter=undefined}=Args) ->
- Args#changes_args{filter = Style};
+make_changes_args(#changes_args{style=Style, filter_fun=undefined}=Args) ->
+ Args#changes_args{filter_fun = {default, Style}};
make_changes_args(Args) ->
Args.