Merge pull request #4147 from jcassette/query-perf

Use short-circuit evaluation in AndQuery and OrQuery (fix #4145)
beetbox · Nov 17, 2021 · 281eec8 · 281eec8
2 parents b7d0ddf + 5e6be0d
commit 281eec8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/beets/dbcore/query.py b/beets/dbcore/query.py
@@ -443,7 +443,7 @@ def clause(self):
         return self.clause_with_joiner('and')
 
     def match(self, item):
-        return all([q.match(item) for q in self.subqueries])
+        return all(q.match(item) for q in self.subqueries)
 
 
 class OrQuery(MutableCollectionQuery):
@@ -453,7 +453,7 @@ def clause(self):
         return self.clause_with_joiner('or')
 
     def match(self, item):
-        return any([q.match(item) for q in self.subqueries])
+        return any(q.match(item) for q in self.subqueries)
 
 
 class NotQuery(Query):

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -74,6 +74,9 @@ Bug fixes:
 * :doc:`/dev/library`: Use slow queries for flexible attributes in aunique.
   :bug:`2678` :bug:`3553`
 
+* :doc:`/reference/query`: Use short-circuit evaluation in AndQuery and OrQuery
+  :bug:`4145`
+
 1.5.0 (August 19, 2021)
 -----------------------