couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kxe...@apache.org
Subject [1/2] fabric commit: updated refs/heads/master to adaf5c2
Date Tue, 03 Feb 2015 16:10:29 GMT
Repository: couchdb-fabric
Updated Branches:
  refs/heads/master f418f0df6 -> adaf5c231


Respect conflicts=true when collecting clustered changes

This correctly reads the conflicts parameter from #changes_args.
Previously we were attempting to look for a conflicts property in
Options which was never set (so always evaluated to false).

Fixes COUCHDB-2518

This closes #11

Signed-off-by: Alexander Shorin <kxepal@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/eb0f5cb3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/eb0f5cb3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/eb0f5cb3

Branch: refs/heads/master
Commit: eb0f5cb370c1ad64155e20a5b762380c3f25ac8d
Parents: f418f0d
Author: Will Holley <willholley@gmail.com>
Authored: Sun Feb 1 21:34:05 2015 +0000
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Tue Feb 3 19:04:32 2015 +0300

----------------------------------------------------------------------
 src/fabric_rpc.erl | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/eb0f5cb3/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index 6ee11b0..4a7881a 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -298,12 +298,14 @@ 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_fun = Filter},
-        options = Options,
+        args = #changes_args{
+            include_docs = IncludeDocs,
+            conflicts = Conflicts,
+            filter_fun = Filter
+        },
         pending = Pending,
         epochs = Epochs
     } = Acc,
-    Conflicts = proplists:get_value(conflicts, Options, false),
     #doc_info{id=Id, high_seq=Seq, revs=[#rev_info{deleted=Del}|_]} = DocInfo,
     case [X || X <- couch_changes:filter(Db, DocInfo, Filter), X /= null] of
     [] ->


Mime
View raw message