diff options
author | Robert Newson <rnewson@apache.org> | 2021-09-15 22:22:14 +0100 |
---|---|---|
committer | Robert Newson <rnewson@apache.org> | 2021-09-15 22:22:14 +0100 |
commit | 064db6ff21fab2baa8254b7eba90c0a2a79b0b88 (patch) | |
tree | bcddc0572b5f033d2d9faf3a1ebc5cc82827280f | |
parent | a36e7308ab4a2cfead6da64a9f83b7776722382d (diff) | |
download | couchdb-064db6ff21fab2baa8254b7eba90c0a2a79b0b88.tar.gz |
Revert "Fix meta result for views when limit = 0"
This reverts commit a36e7308ab4a2cfead6da64a9f83b7776722382d.
-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..b8d0d392a 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, |