Commit 58b95cef authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

return False immediately in Predicate.test() once any check fails to reduce...

return False immediately in Predicate.test() once any check fails to reduce further needless calculations.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35952 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4d9c8fc8
No related merge requests found
...@@ -107,24 +107,30 @@ class Predicate(XMLObject): ...@@ -107,24 +107,30 @@ class Predicate(XMLObject):
# (self.getRelativeUrl(), context.getRelativeUrl())) # (self.getRelativeUrl(), context.getRelativeUrl()))
for property, value in self._identity_criterion.iteritems(): for property, value in self._identity_criterion.iteritems():
if isinstance(value, (list, tuple)): if isinstance(value, (list, tuple)):
result = result and (context.getProperty(property) in value) result = context.getProperty(property) in value
else: else:
result = result and (context.getProperty(property) == value) result = context.getProperty(property) == value
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after prop %s : %s == %s' % \ # '%s after prop %s : %s == %s' % \
# (result, property, context.getProperty(property), value)) # (result, property, context.getProperty(property), value))
if not result:
return result
for property, (min, max) in self._range_criterion.iteritems(): for property, (min, max) in self._range_criterion.iteritems():
value = context.getProperty(property) value = context.getProperty(property)
if min is not None: if min is not None:
result = result and (value >= min) result = value >= min
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after prop %s : %s >= %s' % \ # '%s after prop %s : %s >= %s' % \
# (result, property, value, min)) # (result, property, value, min))
if not result:
return result
if max is not None: if max is not None:
result = result and (value < max) result = value < max
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after prop %s : %s < %s' % \ # '%s after prop %s : %s < %s' % \
# (result, property, value, max)) # (result, property, value, max))
if not result:
return result
multimembership_criterion_base_category_list = \ multimembership_criterion_base_category_list = \
self.getMultimembershipCriterionBaseCategoryList() self.getMultimembershipCriterionBaseCategoryList()
membership_criterion_base_category_list = \ membership_criterion_base_category_list = \
...@@ -169,6 +175,8 @@ class Predicate(XMLObject): ...@@ -169,6 +175,8 @@ class Predicate(XMLObject):
tested_base_category[bc] = tested_base_category[bc] or \ tested_base_category[bc] = tested_base_category[bc] or \
context.isMemberOf(c, context.isMemberOf(c,
strict_membership=strict_membership) strict_membership=strict_membership)
if tested_base_category.get(bc, 1) == 0:
break
finally: finally:
if not enabled: if not enabled:
disableReadOnlyTransactionCache(self) disableReadOnlyTransactionCache(self)
...@@ -176,17 +184,19 @@ class Predicate(XMLObject): ...@@ -176,17 +184,19 @@ class Predicate(XMLObject):
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after single membership to %s' % \ # '%s after single membership to %s' % \
# (tested_base_category[bc], c)) # (tested_base_category[bc], c))
result = result and (0 not in tested_base_category.values()) result = 0 not in tested_base_category.values()
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after category %s ' % (result, tested_base_category.items())) # '%s after category %s ' % (result, tested_base_category.items()))
if not result:
return result
# Test method calls # Test method calls
test_method_id_list = self.getTestMethodIdList() test_method_id_list = self.getTestMethodIdList()
if test_method_id_list is not None : if test_method_id_list is not None :
for test_method_id in test_method_id_list : for test_method_id in test_method_id_list :
if (test_method_id is not None) and result: if test_method_id is not None:
method = getattr(context,test_method_id) method = getattr(context,test_method_id)
try: try:
result = result and method(self) result = method(self)
except TypeError: except TypeError:
if method.func_code.co_argcount != isinstance(method, MethodType): if method.func_code.co_argcount != isinstance(method, MethodType):
raise raise
...@@ -194,9 +204,11 @@ class Predicate(XMLObject): ...@@ -194,9 +204,11 @@ class Predicate(XMLObject):
warn('Predicate %s uses an old-style method (%s) that does not' warn('Predicate %s uses an old-style method (%s) that does not'
' take the predicate as argument' % ( ' take the predicate as argument' % (
self.getRelativeUrl(), method.__name__), DeprecationWarning) self.getRelativeUrl(), method.__name__), DeprecationWarning)
result = result and method() result = method()
# LOG('predicate test', 0, # LOG('predicate test', 0,
# '%s after method %s ' % (result, test_method_id)) # '%s after method %s ' % (result, test_method_id))
if not result:
return result
return result return result
@UnrestrictedMethod @UnrestrictedMethod
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment