[GitHub] willholley closed pull request #1011: Allow to use $or with a mango JSON index

[GitBox <gi...@apache.org>]

willholley closed pull request #1011: Allow to use $or with a mango JSON index
URL: https://github.com/apache/couchdb/pull/1011
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/src/mango/src/mango_selector.erl b/src/mango/src/mango_selector.erl
index 4ff36945a9..ac8d22f8fd 100644
--- a/src/mango/src/mango_selector.erl
+++ b/src/mango/src/mango_selector.erl
@@ -596,10 +596,20 @@ has_required_fields(Selector, RequiredFields) when not is_list(Selector) ->
 % We can "see" through $and operator. We ignore other
 % combination operators because they can't be used to restrict
 % an index.
-has_required_fields([{[{<<"$and">>, Args}]}], RequiredFields) 
+has_required_fields([{[{<<"$and">>, Args}]}], RequiredFields)
         when is_list(Args) ->
     has_required_fields(Args, RequiredFields);
 
+% We can "see" through $or operator if all the clauses require
+% the same field.
+has_required_fields([{[{<<"$or">>, Args}]} | Rest], [Field | RequiredFields])
+        when is_list(Args) ->
+    Pred = fun(A) -> has_required_fields(A, [Field]) end,
+    case lists:all(Pred, Args) of
+        true -> has_required_fields(Rest, RequiredFields);
+        _ ->  has_required_fields(Rest, [Field | RequiredFields])
+    end;
+
 has_required_fields([{[{Field, Cond}]} | Rest], RequiredFields) ->
     case Cond of
         % $exists:false is a special case - this is the only operator
@@ -662,7 +672,7 @@ has_required_fields_and_false_test() ->
     Normalized = normalize(Selector),
     ?assertEqual(false, has_required_fields(Normalized, RequiredFields)).
 
-has_required_fields_or_test() ->
+has_required_fields_or_false_test() ->
     RequiredFields = [<<"A">>],
     Selector = {[{<<"$or">>,
           [
@@ -673,4 +683,18 @@ has_required_fields_or_test() ->
     Normalized = normalize(Selector),
     ?assertEqual(false, has_required_fields(Normalized, RequiredFields)).
 
--endif.
\ No newline at end of file
+has_required_fields_or_true_test() ->
+    RequiredFields = [<<"A">>, <<"B">>, <<"C">>],
+    Selector = {[{<<"A">>, "foo"},
+          {<<"$or">>,
+              [
+                  {[{<<"B">>, <<"bar">>}]},
+                  {[{<<"B">>, <<"baz">>}]}
+              ]
+          },
+		  {<<"C">>, "qux"}
+	]},
+    Normalized = normalize(Selector),
+    ?assertEqual(true, has_required_fields(Normalized, RequiredFields)).
+
+-endif.


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services