couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [24/50] couch commit: updated refs/heads/windsor-merge to 6e60cbe
Date Thu, 07 Aug 2014 15:37:46 GMT
Add stop clause for couch_btree

This is part of "Implement couch_view:get_map_keys/4", the rest was in
couch_view:get_map_keys, a module which no longer exists.


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

Branch: refs/heads/windsor-merge
Commit: 8e09de27be8517147b27902482cf3dcf5d8f5851
Parents: 41b61b9
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Sat Jul 20 17:57:36 2013 -0500
Committer: Robert Newson <rnewson@apache.org>
Committed: Tue Aug 5 17:38:00 2014 +0100

----------------------------------------------------------------------
 src/couch_btree.erl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/8e09de27/src/couch_btree.erl
----------------------------------------------------------------------
diff --git a/src/couch_btree.erl b/src/couch_btree.erl
index 09c3d6a..e9ff7f5 100644
--- a/src/couch_btree.erl
+++ b/src/couch_btree.erl
@@ -714,7 +714,9 @@ stream_kp_node(Bt, Reds, [{Key, Node} | Rest], InRange, Dir, Fun, Acc)
->
             {stop, LastReds, Acc3}
         end;
     {skip, Acc2} ->
-        stream_kp_node(Bt, [Red | Reds], Rest, InRange, Dir, Fun, Acc2)
+        stream_kp_node(Bt, [Red | Reds], Rest, InRange, Dir, Fun, Acc2);
+    {stop, Acc2} ->
+        {stop, Reds, Acc2}
     end.
 
 drop_nodes(_Bt, Reds, _StartKey, []) ->


Mime
View raw message