couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject fabric commit: updated refs/heads/master to 58380bb
Date Fri, 11 Jul 2014 12:55:21 GMT
Repository: couchdb-fabric
Updated Branches:
  refs/heads/master 1b3c7958c -> 58380bb87


couch_query_servers:rereduce takes Lang not #proc

h/t to aschultz for finding it.


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

Branch: refs/heads/master
Commit: 58380bb879f7b07d0a880ff1a5ddde920f0e52f6
Parents: 1b3c795
Author: Robert Newson <rnewson@apache.org>
Authored: Fri Jul 11 13:53:52 2014 +0100
Committer: Robert Newson <rnewson@apache.org>
Committed: Fri Jul 11 13:54:05 2014 +0100

----------------------------------------------------------------------
 src/fabric_view.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/58380bb8/src/fabric_view.erl
----------------------------------------------------------------------
diff --git a/src/fabric_view.erl b/src/fabric_view.erl
index 09e13f2..0d88811 100644
--- a/src/fabric_view.erl
+++ b/src/fabric_view.erl
@@ -196,7 +196,7 @@ get_next_row(#collector{reducer = RedSrc} = St) when RedSrc =/= undefined
->
         query_args = #mrargs{direction=Dir},
         keys = Keys,
         rows = RowDict,
-        os_proc = Proc,
+        lang = Lang,
         counters = Counters0
     } = St,
     {Key, RestKeys} = find_next_key(Keys, Dir, RowDict),
@@ -213,7 +213,7 @@ get_next_row(#collector{reducer = RedSrc} = St) when RedSrc =/= undefined
->
             fabric_dict:update_counter(Worker, -1, CntrsAcc)
         end, Counters0, Records),
         Wrapped = [[V] || #view_row{value=V} <- Records],
-        {ok, [Reduced]} = couch_query_servers:rereduce(Proc, [RedSrc], Wrapped),
+        {ok, [Reduced]} = couch_query_servers:rereduce(Lang, [RedSrc], Wrapped),
         NewSt = St#collector{keys=RestKeys, rows=NewRowDict, counters=Counters},
         {#view_row{key=Key, id=reduced, value=Reduced}, NewSt};
     error ->


Mime
View raw message