diff options
author | Robert Newson <rnewson@apache.org> | 2021-09-15 22:53:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-15 22:53:46 +0100 |
commit | 17c029b5d97c6baed78b6202805c05a9b962f1ab (patch) | |
tree | 777e710b1f79da736c9de93251e521ceee94eeb0 | |
parent | a36e7308ab4a2cfead6da64a9f83b7776722382d (diff) | |
parent | 4e158bbe136d02c81bad8e928fb9febe1777df17 (diff) | |
download | couchdb-17c029b5d97c6baed78b6202805c05a9b962f1ab.tar.gz |
Merge pull request #3754 from apache/fix-limit0-for-views-again
Fix limit0 for views again
-rw-r--r-- | src/fabric/src/fabric_view_map.erl | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/fabric/src/fabric_view_map.erl b/src/fabric/src/fabric_view_map.erl index 6477654fc..ff6aa8b69 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{sorted=false, 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, |