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:18 UTC
[43/50] fabric commit: updated refs/heads/master to a71701c
squashme! use stream2
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/7a8244ef
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/7a8244ef
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/7a8244ef
Branch: refs/heads/master
Commit: 7a8244efdfaae6ae64887f715cefe0cc1e429c18
Parents: b1c0030
Author: Robert Newson <rn...@apache.org>
Authored: Thu Aug 7 22:19:16 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 7 22:19:16 2014 +0100
----------------------------------------------------------------------
src/fabric_rpc.erl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/7a8244ef/src/fabric_rpc.erl
----------------------------------------------------------------------
diff --git a/src/fabric_rpc.erl b/src/fabric_rpc.erl
index b5ec718..f6d8515 100644
--- a/src/fabric_rpc.erl
+++ b/src/fabric_rpc.erl
@@ -253,7 +253,7 @@ get_or_create_db(DbName, Options) ->
view_cb({meta, Meta}, Acc) ->
% Map function starting
- case rexi:sync_reply({meta, Meta}) of
+ case rexi:stream2({meta, Meta}) of
ok ->
{ok, Acc};
stop ->
@@ -269,7 +269,7 @@ view_cb({row, Row}, Acc) ->
value = couch_util:get_value(value, Row),
doc = couch_util:get_value(doc, Row)
},
- case rexi:stream(ViewRow) of
+ case rexi:stream2(ViewRow) of
ok ->
{ok, Acc};
timeout ->
@@ -305,7 +305,7 @@ reduce_cb(complete, Acc) ->
send(Key, Value, Acc) ->
case put(fabric_sent_first_row, true) of
undefined ->
- case rexi:sync_reply(#view_row{key=Key, value=Value}) of
+ case rexi:stream2(#view_row{key=Key, value=Value}) of
ok ->
{ok, Acc};
stop ->
@@ -314,7 +314,7 @@ send(Key, Value, Acc) ->
exit(timeout)
end;
true ->
- case rexi:stream(#view_row{key=Key, value=Value}) of
+ case rexi:stream2(#view_row{key=Key, value=Value}) of
ok ->
{ok, Acc};
timeout ->
@@ -347,7 +347,7 @@ changes_enumerator(DocInfo, Acc) ->
{deleted, Del} |
if IncludeDocs -> [doc_member(Db, DocInfo, Opts)]; true -> [] end
]},
- Go = rexi:sync_reply(ChangesRow),
+ Go = rexi:stream2(ChangesRow),
{Go, Acc#cacc{seq = Seq, pending = Pending-1}}
end.