0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

use more sub selects

Browse source
This commit is contained in:
j 2016-01-07 12:25:39 +05:30
parent c166f19f80
commit 8eba8e41e5
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
oml/queryparser.py
View file

@ -110,9 +110,9 @@ class Parser(object):
q = get_operator(op)(self._find.findvalue, v) q = get_operator(op)(self._find.findvalue, v)
if k != '*': if k != '*':
q &= (self._find.key == k) q &= (self._find.key == k)
self._joins.append(self._find) ids = self._model.query.join(self._find).filter(q).options(load_only('id'))
if exclude: in_op = operators.notin_op if exclude else operators.in_op
q = ~q q = in_op(self._model.id, ids)
return q return q
elif k == 'list': elif k == 'list':
nickname, name = v.split(':', 1) nickname, name = v.split(':', 1)
@ -134,15 +134,15 @@ class Parser(object):
v = parse_date(v.split('-')) v = parse_date(v.split('-'))
vk = getattr(self._sort, k) vk = getattr(self._sort, k)
q = get_operator(op, 'int')(vk, v) q = get_operator(op, 'int')(vk, v)
self._joins.append(self._sort) ids = self._model.query.join(self._find).filter(q).options(load_only('id'))
if exclude: in_op = operators.notin_op if exclude else operators.in_op
q = ~q q = in_op(self._model.id, ids)
return q return q
else: #integer, float, time else: #integer, float, time
q = get_operator(op, 'int')(getattr(self._sort, k), v) q = get_operator(op, 'int')(getattr(self._sort, k), v)
self._joins.append(self._sort) ids = self._model.query.join(self._find).filter(q).options(load_only('id'))
if exclude: in_op = operators.notin_op if exclude else operators.in_op
q = ~q q = in_op(self._model.id, ids)
return q return q
def parse_conditions(self, conditions, operator): def parse_conditions(self, conditions, operator):
@ -212,15 +212,9 @@ class Parser(object):
#join query with operator #join query with operator
qs = self._model.query qs = self._model.query
#only include items that have hard metadata #only include items that have hard metadata
self._joins = []
conditions = self.parse_conditions(data.get('query', {}).get('conditions', []), conditions = self.parse_conditions(data.get('query', {}).get('conditions', []),
data.get('query', {}).get('operator', '&')) data.get('query', {}).get('operator', '&'))
for c in conditions: for c in conditions:
if self._joins:
qs = qs.join(self._joins.pop(0))
qs = qs.filter(c) qs = qs.filter(c)
# FIXME: group_by needed here to avoid
# duplicates due to joins.
qs = qs.group_by(self._model.id)
#print(qs) #print(qs)
return qs return qs