couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [33/37] couch-replicator commit: updated refs/heads/master to aafb5f9
Date Thu, 28 Aug 2014 12:16:04 GMT
Fix return from the changes_reader_cb

CouchDB's changes enumerator doesn't support stopping the read midstream
so we need to not return a tagged accumulator.


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

Branch: refs/heads/master
Commit: c6be20d1d1e644d76dc0f55ff3eec0e2c5170889
Parents: e5e5d84
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Tue Aug 12 12:39:28 2014 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Tue Aug 12 12:39:28 2014 -0500

----------------------------------------------------------------------
 src/couch_replicator_manager.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-replicator/blob/c6be20d1/src/couch_replicator_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator_manager.erl b/src/couch_replicator_manager.erl
index 3566433..099b215 100644
--- a/src/couch_replicator_manager.erl
+++ b/src/couch_replicator_manager.erl
@@ -316,13 +316,13 @@ changes_reader_cb({change, Change, _}, _, {Server, DbName}) ->
         false ->
             ok
     end,
-    {ok, {Server, DbName}};
+    {Server, DbName};
 changes_reader_cb({stop, EndSeq, _Pending}, _, {Server, DbName}) ->
     Msg = {rep_db_checkpoint, DbName, EndSeq},
     ok = gen_server:call(Server, Msg, infinity),
-    {ok, {Server, DbName}};
+    {Server, DbName};
 changes_reader_cb(_, _, Acc) ->
-    {ok, Acc}.
+    Acc.
 
 has_valid_rep_id({Change}) ->
     has_valid_rep_id(get_json_value(<<"id">>, Change));


Mime
View raw message