short circuit exists query on select objects

ENCODE-DCC · Nov 11, 2020 · 0c22a37 · 0c22a37
1 parent b3813f3
commit 0c22a37
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/src/snovault/elasticsearch/searches/interfaces.py b/src/snovault/elasticsearch/searches/interfaces.py
@@ -86,3 +86,7 @@
 X = 'x'
 Y = 'y'
 YES = 'yes'
+SHORT_CIRCUITS = [
+    'embedded.files',
+    'embedded.files.quality_metrics',
+    'embedded.replicate']
diff --git a/src/snovault/elasticsearch/searches/queries.py b/src/snovault/elasticsearch/searches/queries.py
@@ -75,6 +75,7 @@
 from .interfaces import X
 from .interfaces import Y
 from .interfaces import YES
+from .interfaces import SHORT_CIRCUITS
 
 
 class AbstractQueryFactory:
@@ -535,6 +536,8 @@ def _make_must_equal_terms_queries_from_params(self, params):
         )
 
     def _make_field_must_exist_query(self, field, **kwargs):
+        if field in SHORT_CIRCUITS:
+            field = field + '.@id'
         return Q(
             EXISTS,
             field=field
@@ -588,6 +591,8 @@ def _make_terms_aggregation(self, field, **kwargs):
         )
 
     def _make_exists_aggregation(self, field, **kwargs):
+        if field in SHORT_CIRCUITS:
+            field = field + '.@id'
         return A(
             FILTERS,
             filters={

diff --git a/src/snovault/tests/test_searches_queries.py b/src/snovault/tests/test_searches_queries.py
@@ -1697,6 +1697,18 @@ def test_searches_queries_abstract_query_factory_make_field_must_exist_query(par
         }
     }
 
+def test_searches_queries_abstract_query_factory_make_field_must_exist_query_with_wildcard(params_parser):
+    from snovault.elasticsearch.searches.queries import AbstractQueryFactory
+    aq = AbstractQueryFactory(params_parser)
+    meq = aq._make_field_must_exist_query(
+        field='embedded.files'
+    )
+    assert meq.to_dict() == {
+        'exists': {
+            'field': 'embedded.files.@id'
+        }
+    }
+
 
 def test_searches_queries_abstract_query_factory_make_field_must_exist_queries_from_params(params_parser):
     from snovault.elasticsearch.searches.queries import AbstractQueryFactory
@@ -1798,6 +1810,29 @@ def test_searches_queries_abstract_query_factory_make_exists_aggregation(params_
         }
     }
 
+def test_searches_queries_abstract_query_factory_make_exists_aggregation_with_wildcard(params_parser):
+    from snovault.elasticsearch.searches.queries import AbstractQueryFactory
+    aq = AbstractQueryFactory(params_parser)
+    eq = aq._make_exists_aggregation(
+        field='embedded.files'
+    )
+    assert eq.to_dict() == {
+        'filters': {
+            'filters': {
+                'no': {
+                    'bool': {
+                        'must_not': [
+                            {'exists': {'field': 'embedded.files.@id'}}
+                        ]
+                    }
+                },
+                'yes': {
+                    'exists': {'field': 'embedded.files.@id'}
+                }
+            }
+        }
+    }
+
 
 def test_searches_queries_abstract_query_factory_map_param_to_elasticsearch_field():
     from snovault.elasticsearch.searches.queries import AbstractQueryFactory