changeset 78a1a046d717 in tryton:default
details: https://hg.tryton.org/tryton?cmd=changeset&node=78a1a046d717
description:
Deduplicate entries in domain inversion's simplify
issue11248
review397301002
diffstat:
tryton/common/domain_inversion.py | 71 +++++++++++++++++++++++++++++++-------
1 files changed, 57 insertions(+), 14 deletions(-)
diffs (83 lines):
diff -r 6cb3b508c1c8 -r 78a1a046d717 tryton/common/domain_inversion.py
--- a/tryton/common/domain_inversion.py Sat Mar 26 13:00:03 2022 +0100
+++ b/tryton/common/domain_inversion.py Wed Mar 30 19:20:31 2022 +0200
@@ -284,22 +284,65 @@
for part in domain]
-def simplify(domain):
- "remove unused domain delimiter"
- if is_leaf(domain):
- return domain
- elif domain in ('OR', 'AND'):
- return domain
- elif domain in (['OR'], ['AND']):
+def bool_operator(domain):
+ "Returns the boolean operator used by a domain"
+ bool_op = 'AND'
+ if domain and domain[0] in ['AND', 'OR']:
+ bool_op = domain[0]
+ return bool_op
+
+
+def simplify_nested(domain):
+ """Simplify extra domain markers"""
+ if not domain:
return []
- elif (isinstance(domain, list) and len(domain) == 1
- and not is_leaf(domain[0])):
- return simplify(domain[0])
- elif (isinstance(domain, list) and len(domain) == 2
- and domain[0] in ('AND', 'OR')):
- return [simplify(domain[1])]
+ elif is_leaf(domain):
+ return [domain]
+ elif domain in ['OR', 'AND']:
+ return [domain]
+ elif isinstance(domain, list) and len(domain) == 1:
+ return simplify_nested(domain[0])
else:
- return [simplify(branch) for branch in domain]
+ simplified = []
+ domain_op = bool_operator(domain)
+ for branch in domain:
+ simplified_branch = simplify_nested(branch)
+ if (bool_operator(branch) == domain_op
+ or len(simplified_branch) == 1):
+ simplified.extend(simplified_branch)
+ else:
+ simplified.append(simplified_branch)
+ return simplified
+
+
+def simplify_duplicate(domain):
+ """Remove duplicates subdomain from domain"""
+ dedup_branches = []
+ bool_op = None
+ if domain[0] in ['AND', 'OR']:
+ bool_op, *domain = domain
+ for branch in domain:
+ simplified_branch = simplify(branch)
+ if not simplified_branch:
+ if bool_op == 'OR':
+ return []
+ else:
+ continue
+ elif simplified_branch not in dedup_branches:
+ dedup_branches.append(simplified_branch)
+ if bool_op and len(dedup_branches) > 1:
+ dedup_branches.insert(0, bool_op)
+ return dedup_branches
+
+
+def simplify(domain):
+ """Remove duplicate expressions and useless OR/AND"""
+ if is_leaf(domain):
+ return [domain]
+ elif not domain:
+ return domain
+ else:
+ return simplify_nested(simplify_duplicate(domain))
def merge(domain, domoperator=None):
