You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ko...@apache.org on 2017/03/01 16:38:15 UTC

[41/43] couch-mrview commit: updated refs/heads/2971-count-distinct to f7c3c24

Re-use get update_options in get(info)


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/8b1c137e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/8b1c137e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/8b1c137e

Branch: refs/heads/2971-count-distinct
Commit: 8b1c137ea4decca2ac4f3717b71f369fbdb5d7b5
Parents: f7f4db2
Author: Eric Avdey <ei...@eiri.ca>
Authored: Wed Feb 8 14:05:37 2017 -0400
Committer: Eric Avdey <ei...@eiri.ca>
Committed: Wed Feb 8 14:05:37 2017 -0400

----------------------------------------------------------------------
 src/couch_mrview_index.erl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/8b1c137e/src/couch_mrview_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl
index 47245bd..a65bc94 100644
--- a/src/couch_mrview_index.erl
+++ b/src/couch_mrview_index.erl
@@ -74,12 +74,9 @@ get(info, State) ->
     LocalSeq = couch_util:get_value(<<"local_seq">>, Opts, false),
     SeqIndexed = couch_util:get_value(<<"seq_indexed">>, Opts, false),
     KeySeqIndexed = couch_util:get_value(<<"keyseq_indexed">>, Opts, false),
-    UpdateOptions =
-        if IncDesign -> [<<"include_design">>]; true -> [] end
-        ++ if LocalSeq -> [<<"local_seq">>]; true -> [] end
-        ++ if KeySeqIndexed -> [<<"keyseq_indexed">>]; true -> [] end
-        ++ if SeqIndexed -> [<<"seq_indexed">>]; true -> [] end,
 
+    UpdateOptions0 = get(update_options, State),
+    UpdateOptions = [atom_to_binary(O, latin1) || O <- UpdateOptions0],
 
     {ok, [
         {signature, list_to_binary(couch_index_util:hexsig(Sig))},