feat(mango): strict index selection

rel/overlay/etc/default.ini

@@ -496,6 +496,12 @@ authentication_db = _users
 ; the warning.
 ;index_scan_warning_threshold = 10
 
+; Set to true to make index selection strict.  Indexes always have to be
+; specified by the use_index parameter, they are not selected automatically
+; for the query.  An error is returned if the user-specified index is not
+; found.  This can be overridden (inverted) ad-hoc by the query parameters.
+;strict_index_selection = false
+
 [indexers]
 couch_mrview = true
 

src/docs/src/api/database/find.rst

@@ -45,6 +45,10 @@
     :<json string|array use_index: Instruct a query to use a specific index.
         Specified either as ``"<design_document>"`` or
         ``["<design_document>", "<index_name>"]``. *Optional*
+    :<json boolean use_index_strict: Do not perform the query unless
+       the index specified by ``use_index`` is found and suitable.
+       The use of this parameter implies the use of
+       ``use_index``. *Optional*
     :<json boolean conflicts: Include conflicted documents if ``true``.
         Intended use is to easily find conflicted documents, without an
         index or view. Default is ``false``. *Optional*
@@ -1479,7 +1483,8 @@ it easier to take advantage of future improvements to query planning
                 "stable": false,
                 "stale": false,
                 "update": true,
-                "use_index": []
+                "use_index": [],
+                "use_index_strict": false
             },
             "mrargs": {
                 "conflicts": "undefined",
@@ -1512,7 +1517,9 @@ Index selection
 ===============
 
 :ref:`_find <api/db/_find>` chooses which index to use for responding
-to a query, unless you specify an index at query time.
+to a query, unless you specify an index at query time.  Note that this
+is just a hint for the query planner and as such it might be ignored
+if the named index is not suitable for performing the query.
 
 The query planner looks at the selector section and finds the index with the
 closest match to operators and fields used in the query. If there are two
@@ -1525,3 +1532,8 @@ the index with the first alphabetical name is chosen.
     It is good practice to specify indexes explicitly in your queries. This
     prevents existing queries being affected by new indexes that might get added
     in a production environment.
+
+Setting the ``use_index_strict`` parameter to ``true`` disables the
+automated query planning.  In that case, one must specify an index
+which will be checked for usability and an error is return when it is
+not specified or it is not usable.

src/docs/src/config/query-servers.rst

@@ -309,3 +309,20 @@ Mango is the Query Engine that services the :ref:`_find <api/db/_find>`, endpoin
 
             [mango]
             index_scan_warning_threshold = 10
+
+    .. config:option:: strict_index_selection :: Strict index selection.
+
+        .. versionadded:: 3.4
+
+        Make the index selection strict.  The query planner will not
+        try to find a suitable index automatically but use the
+        user-specified index and give up immediately in case of
+        failure.  This implictly makes the use of the ``use_index``
+        query parameter mandatory.  Using the ``use_index_strict``
+        Boolean parameter, this behavior may be adjusted per query.
+
+        Defaults to ``false``.
+        ::
+
+            [mango]
+            strict_index_selection = false

src/mango/src/mango_cursor.erl

@@ -47,10 +47,26 @@
 create(Db, Selector0, Opts) ->
     Selector = mango_selector:normalize(Selector0),
     UsableIndexes = mango_idx:get_usable_indexes(Db, Selector, Opts),
-    case mango_cursor:maybe_filter_indexes_by_ddoc(UsableIndexes, Opts) of
+    case maybe_filter_indexes_by_ddoc(UsableIndexes, Opts) of
         [] ->
-            % use_index doesn't match a valid index - fall back to a valid one
-            create_cursor(Db, UsableIndexes, Selector, Opts);
+            % use_index doesn't match a valid index - determine how
+            % this shall be handlded by the settings
+            case (use_index_strict(Opts)) of
+                true ->
+                    % return an error
+                    Details =
+                        case use_index(Opts) of
+                            [] ->
+                                [];
+                            UseIndex ->
+                                [DesignId | Rest] = UseIndex,
+                                [ddoc_name(DesignId) | Rest]
+                        end,
+                    ?MANGO_ERROR({invalid_index, Details});
+                false ->
+                    % fall back to a valid one
+                    create_cursor(Db, UsableIndexes, Selector, Opts)
+            end;
         UserSpecifiedIndex ->
             create_cursor(Db, UserSpecifiedIndex, Selector, Opts)
     end.
@@ -93,13 +109,25 @@ execute(#cursor{index = Idx} = Cursor, UserFun, UserAcc) ->
     Mod = mango_idx:cursor_mod(Idx),
     Mod:execute(Cursor, UserFun, UserAcc).
 
+use_index(Opts) ->
+    {use_index, UseIndex} = lists:keyfind(use_index, 1, Opts),
+    UseIndex.
+
+use_index_strict(Opts) ->
+    case lists:keyfind(use_index_strict, 1, Opts) of
+        {use_index_strict, ByQuery} ->
+            ByQuery;
+        false ->
+            config:get_boolean("mango", "strict_index_selection", false)
+    end.
+
 maybe_filter_indexes_by_ddoc(Indexes, Opts) ->
-    case lists:keyfind(use_index, 1, Opts) of
-        {use_index, []} ->
+    case use_index(Opts) of
+        [] ->
             [];
-        {use_index, [DesignId]} ->
+        [DesignId] ->
             filter_indexes(Indexes, DesignId);
-        {use_index, [DesignId, ViewName]} ->
+        [DesignId, ViewName] ->
             filter_indexes(Indexes, DesignId, ViewName)
     end.
 
@@ -263,3 +291,48 @@ ddoc_name(<<"_design/", Name/binary>>) ->
     Name;
 ddoc_name(Name) ->
     Name.
+
+-ifdef(TEST).
+-include_lib("couch/include/couch_eunit.hrl").
+
+use_index_strict_test_() ->
+    {
+        foreach,
+        fun() ->
+            meck:new(config)
+        end,
+        fun(_) ->
+            meck:unload(config)
+        end,
+        [
+            ?TDEF_FE(t_use_index_strict_disabled_not_requested),
+            ?TDEF_FE(t_use_index_strict_disabled_requested),
+            ?TDEF_FE(t_use_index_strict_enabled_not_requested),
+            ?TDEF_FE(t_use_index_strict_enabled_requested)
+        ]
+    }.
+
+t_use_index_strict_disabled_not_requested(_) ->
+    meck:expect(config, get_boolean, ["mango", "strict_index_selection", '_'], meck:val(false)),
+    Options1 = [{use_index_strict, false}],
+    ?assertEqual(false, use_index_strict(Options1)),
+    Options2 = [],
+    ?assertEqual(false, use_index_strict(Options2)).
+
+t_use_index_strict_disabled_requested(_) ->
+    meck:expect(config, get_boolean, ["mango", "strict_index_selection", '_'], meck:val(false)),
+    Options = [{use_index_strict, true}],
+    ?assertEqual(true, use_index_strict(Options)).
+
+t_use_index_strict_enabled_not_requested(_) ->
+    meck:expect(config, get_boolean, ["mango", "strict_index_selection", '_'], meck:val(true)),
+    Options1 = [{use_index_strict, false}],
+    ?assertEqual(false, use_index_strict(Options1)),
+    Options2 = [],
+    ?assertEqual(true, use_index_strict(Options2)).
+
+t_use_index_strict_enabled_requested(_) ->
+    meck:expect(config, get_boolean, ["mango", "strict_index_selection", '_'], meck:val(true)),
+    Options = [{use_index_strict, true}],
+    ?assertEqual(true, use_index_strict(Options)).
+-endif.

src/mango/src/mango_error.erl

@@ -48,6 +48,28 @@ info(mango_json_bookmark, {invalid_bookmark, BadBookmark}) ->
         <<"invalid_bookmark">>,
         fmt("Invalid bookmark value: ~s", [?JSON_ENCODE(BadBookmark)])
     };
+info(mango_cursor, {invalid_index, []}) ->
+    {
+        400,
+        <<"invalid_index">>,
+        <<"You must specify an index with the `use_index` parameter.">>
+    };
+info(mango_cursor, {invalid_index, [DDocName]}) ->
+    {
+        400,
+        <<"invalid_index">>,
+        fmt("_design/~s specified by `use_index` could not be found or it is not suitable.", [
+            DDocName
+        ])
+    };
+info(mango_cursor, {invalid_index, [DDocName, ViewName]}) ->
+    {
+        400,
+        <<"invalid_index">>,
+        fmt("_design/~s, ~s specified by `use_index` could not be found or it is not suitable.", [
+            DDocName, ViewName
+        ])
+    };
 info(mango_cursor_text, {invalid_bookmark, BadBookmark}) ->
     {
         400,

src/mango/src/mango_opts.erl

@@ -91,6 +91,12 @@ validate_find({Props}) ->
             {default, []},
             {validator, fun validate_use_index/1}
         ]},
+        {<<"use_index_strict">>, [
+            {tag, use_index_strict},
+            {optional, true},
+            {default, false},
+            {validator, fun mango_opts:is_boolean/1}
+        ]},
         {<<"bookmark">>, [
             {tag, bookmark},
             {optional, true},

src/mango/test/02-basic-find-test.py

@@ -311,6 +311,7 @@ def test_explain_options(self):
         assert opts["stale"] == False
         assert opts["update"] == True
         assert opts["use_index"] == []
+        assert opts["use_index_strict"] == False
 
     def test_sort_with_all_docs(self):
         explain = self.db.find(

src/mango/test/05-index-selection-test.py

@@ -211,6 +211,25 @@ def test_explain_sort_reverse(self):
         )
         self.assertEqual(resp_explain["index"]["type"], "json")
 
+    def test_strict_index_selection(self):
+        with self.subTest(with_use_index=True):
+            try:
+                self.db.find(
+                    {"manager": True}, use_index="invalid", use_index_strict=True
+                )
+            except Exception as e:
+                self.assertEqual(e.response.status_code, 400)
+            else:
+                raise AssertionError("did not fail on invalid index")
+
+        with self.subTest(with_use_index=False):
+            try:
+                self.db.find({"manager": True}, use_index_strict=True)
+            except Exception as e:
+                self.assertEqual(e.response.status_code, 400)
+            else:
+                raise AssertionError("did not fail due to missing use_index")
+
 
 class JSONIndexSelectionTests(mango.UserDocsTests, IndexSelectionTests):
     @classmethod

src/mango/test/mango.py

@@ -248,6 +248,7 @@ def find(
         update=True,
         executionStats=False,
         partition=None,
+        use_index_strict=None,
     ):
         body = {
             "selector": selector,
@@ -267,6 +268,8 @@ def find(
             body["update"] = False
         if executionStats == True:
             body["execution_stats"] = True
+        if use_index_strict is not None:
+            body["use_index_strict"] = use_index_strict
         body = json.dumps(body)
         if partition:
             ppath = "_partition/{}/".format(partition)