summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorILYA Khlopotov <iilyak@apache.org>2020-05-14 15:14:37 -0700
committerILYA Khlopotov <iilyak@apache.org>2020-05-15 11:13:53 -0700
commit404174118f9eb38d44543c6e430e938e865cc269 (patch)
treee5e64139df8202fded64da5911068f4853d7b896
parent3846af79aad5a1ee16164fc50eeedfd39f269385 (diff)
downloadcouchdb-404174118f9eb38d44543c6e430e938e865cc269.tar.gz
Move not_implemented check down to allow testing of validation
-rw-r--r--src/couch_views/src/couch_views_util.erl11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/couch_views/src/couch_views_util.erl b/src/couch_views/src/couch_views_util.erl
index 24e2f8a2d..395660c02 100644
--- a/src/couch_views/src/couch_views_util.erl
+++ b/src/couch_views/src/couch_views_util.erl
@@ -86,11 +86,6 @@ validate_args(#mrargs{} = Args) ->
GroupLevel = determine_group_level(Args),
Reduce = Args#mrargs.reduce,
- case Reduce =/= undefined orelse Args#mrargs.view_type == red of
- true -> throw(not_implemented);
- false -> ok
- end,
-
case Reduce == undefined orelse is_boolean(Reduce) of
true -> ok;
_ -> mrverror(<<"Invalid `reduce` value.">>)
@@ -198,6 +193,12 @@ validate_args(#mrargs{} = Args) ->
_ -> mrverror(<<"Invalid value for `sorted`.">>)
end,
+ case {Reduce, Args#mrargs.view_type} of
+ {false, _} -> ok;
+ {_, red} -> throw(not_implemented);
+ _ -> ok
+ end,
+
Args#mrargs{group_level=GroupLevel}.