shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

Merge pull request #3191 from chrismeyersfsu/fix-job_event_smart_inv_slow_take_two_devel

Browse Source 
do not observe queries when constructing them

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2019-02-12 22:27:11 +00:00 committed by GitHub
commit 8a3c10686e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
awx/main/tests/unit/utils/test_filters.py
View File

@ -5,6 +5,7 @@ from unittest import mock
# AWX
from awx.main.utils.filters import SmartFilter, ExternalLoggerEnabled
from awx.main.models import Host
# Django
from django.db.models import Q
@ -199,7 +200,6 @@ class TestSmartFilterQueryFromString():
@pytest.mark.parametrize("filter_string,q_expected", [
('search=foo', Q(Q(**{u"name__icontains": u"foo"}) | Q(**{ u"description__icontains": u"foo"}))),
('group__search=foo', Q(Q(**{u"group__name__icontains": u"foo"}) | Q(**{u"group__description__icontains": u"foo"}))),
('search=foo and group__search=foo', Q(
Q(**{u"name__icontains": u"foo"}) | Q(**{ u"description__icontains": u"foo"}),
@ -207,15 +207,35 @@ class TestSmartFilterQueryFromString():
('search=foo or ansible_facts__a=null',
Q(Q(**{u"name__icontains": u"foo"}) | Q(**{u"description__icontains": u"foo"})) |
Q(**{u"ansible_facts__contains": {u"a": None}})),
('search=foo or ansible_facts__a="null"',
Q(Q(**{u"name__icontains": u"foo"}) | Q(**{u"description__icontains": u"foo"})) |
Q(**{u"ansible_facts__contains": {u"a": u"\"null\""}})),
])
def test_search_related_fields(self, mock_get_host_model, filter_string, q_expected):
q = SmartFilter.query_from_string(filter_string)
assert str(q) == str(q_expected)
class TestSmartFilterQueryFromStringNoDB():
@pytest.mark.parametrize("filter_string,q_expected", [
('ansible_facts__a="true" and ansible_facts__b="true" and ansible_facts__c="true"',
(Q(**{u"ansible_facts__contains": {u"a": u"true"}}) &
Q(**{u"ansible_facts__contains": {u"b": u"true"}}) &
Q(**{u"ansible_facts__contains": {u"c": u"true"}}))),
('ansible_facts__a="true" or ansible_facts__b="true" or ansible_facts__c="true"',
(Q(**{u"ansible_facts__contains": {u"a": u"true"}}) |
Q(**{u"ansible_facts__contains": {u"b": u"true"}}) |
Q(**{u"ansible_facts__contains": {u"c": u"true"}}))),
('search=foo',
Q(Q(**{ u"description__icontains": u"foo"}) | Q(**{u"name__icontains": u"foo"}))),
('search=foo and ansible_facts__a="null"',
Q(Q(**{u"description__icontains": u"foo"}) | Q(**{u"name__icontains": u"foo"})) &
Q(**{u"ansible_facts__contains": {u"a": u"\"null\""}})),
('name=foo or name=bar and name=foobar',
Q(name="foo") | Q(name="bar") & Q(name="foobar"))
])
def test_does_not_invoke_db(self, filter_string, q_expected):
q = SmartFilter.query_from_string(filter_string)
assert str(q.query) == str(Host.objects.filter(q_expected).query)
'''
#('"facts__quoted_val"="f\"oo"', 1),
#('facts__facts__arr[]="foo"', 1),

6
awx/main/utils/filters.py
View File

@ -297,7 +297,11 @@ class SmartFilter(object):
self.result = None
i = 2
while i < len(t[0]):
if not self.result:
'''
Do NOT observe self.result. It will cause the sql query to be executed.
We do not want that. We only want to build the query.
'''
if isinstance(self.result, type(None)):
self.result = t[0][0].result
right = t[0][i].result
self.result = self.execute_logic(self.result, right)