Use proper collation fun for reduce grouping
We had been using raw collation for grouping keys in a MR view
regardless of the overall collation setting for the view. This patch
defers the construction of the grouping function to the btree code,
where we have access to the correct sorting function.
COUCHDB-1805
diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl
index f4ba6e1..5583f1f 100644
--- a/src/couch_mrview.erl
+++ b/src/couch_mrview.erl
@@ -440,8 +440,8 @@
update_seq=View#mrview.update_seq,
args=Args
},
- GroupFun = group_rows_fun(Args#mrargs.group_level),
- OptList = couch_mrview_util:key_opts(Args, [{key_group_fun, GroupFun}]),
+ Grouping = {key_group_level, Args#mrargs.group_level},
+ OptList = couch_mrview_util:key_opts(Args, [Grouping]),
Acc2 = lists:foldl(fun(Opts, Acc0) ->
{ok, Acc1} =
couch_mrview_util:fold_reduce(RedView, fun red_fold/3, Acc0, Opts),
@@ -530,18 +530,6 @@
end.
-group_rows_fun(exact) ->
- fun({Key1,_}, {Key2,_}) -> Key1 == Key2 end;
-group_rows_fun(0) ->
- fun(_A, _B) -> true end;
-group_rows_fun(GroupLevel) when is_integer(GroupLevel) ->
- fun({[_|_] = Key1,_}, {[_|_] = Key2,_}) ->
- lists:sublist(Key1, GroupLevel) == lists:sublist(Key2, GroupLevel);
- ({Key1,_}, {Key2,_}) ->
- Key1 == Key2
- end.
-
-
default_cb(complete, Acc) ->
{ok, lists:reverse(Acc)};
default_cb({final, Info}, []) ->
