Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1DD2C11C1D for ; Thu, 28 Aug 2014 12:20:44 +0000 (UTC) Received: (qmail 31338 invoked by uid 500); 28 Aug 2014 12:20:38 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 31164 invoked by uid 500); 28 Aug 2014 12:20:38 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 29989 invoked by uid 99); 28 Aug 2014 12:20:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Aug 2014 12:20:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47B73A02D75; Thu, 28 Aug 2014 12:20:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Date: Thu, 28 Aug 2014 12:21:18 -0000 Message-Id: In-Reply-To: <5384cbf1693f42f3b80f6314b8f731e0@git.apache.org> References: <5384cbf1693f42f3b80f6314b8f731e0@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Thu Aug 7 22:19:16 2014 +0100 Committer: Robert Newson 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.