Simplify logic in Predicate.gather_required_columns implementations.

lsst · Dec 25, 2023 · 47b2991 · 47b2991
1 parent 4d7bfda
commit 47b2991
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/python/lsst/daf/butler/queries/relation_tree/_predicate.py b/python/lsst/daf/butler/queries/relation_tree/_predicate.py
@@ -71,8 +71,8 @@ class LogicalAnd(PredicateBase):
 
     def gather_required_columns(self) -> set[ColumnReference]:
         # Docstring inherited.
-        result = self.operands[0].gather_required_columns()
-        for operand in self.operands[1:]:
+        result: set[ColumnReference] = set()
+        for operand in self.operands:
             result.update(operand.gather_required_columns())
         return result
 
@@ -105,8 +105,8 @@ class LogicalOr(PredicateBase):
 
     def gather_required_columns(self) -> set[ColumnReference]:
         # Docstring inherited.
-        result = self.operands[0].gather_required_columns()
-        for operand in self.operands[1:]:
+        result: set[ColumnReference] = set()
+        for operand in self.operands:
             result.update(operand.gather_required_columns())
         return result