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 2021/09/15 21:25:51 UTC

[couchdb] 01/02: Revert "Fix meta result for views when limit = 0"

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch fix-limit0-for-views-again
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 064db6ff21fab2baa8254b7eba90c0a2a79b0b88
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Sep 15 22:22:14 2021 +0100

    Revert "Fix meta result for views when limit = 0"
    
    This reverts commit a36e7308ab4a2cfead6da64a9f83b7776722382d.
---
 src/fabric/src/fabric_view_map.erl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/fabric/src/fabric_view_map.erl b/src/fabric/src/fabric_view_map.erl
index 6477654..b8d0d39 100644
--- a/src/fabric/src/fabric_view_map.erl
+++ b/src/fabric/src/fabric_view_map.erl
@@ -146,11 +146,10 @@ handle_message({meta, Meta0}, {Worker, From}, State) ->
         }}
     end;
 
-handle_message(#view_row{}, {_, From}, #collector{limit=0} = State) ->
-    rexi:stream_ack(From),
-    % Rely on limit=0 clause in maybe_send_row/1 to wait until all
-    % shard ranges reply with meta
-    fabric_view:maybe_send_row(State);
+handle_message(#view_row{}, {_, _}, #collector{limit=0} = State) ->
+    #collector{callback=Callback} = State,
+    {_, Acc} = Callback(complete, State#collector.user_acc),
+    {stop, State#collector{user_acc=Acc}};
 
 handle_message(#view_row{} = Row, {_,From}, #collector{sorted=false} = St) ->
     #collector{callback=Callback, user_acc=AccIn, limit=Limit} = St,