Merge pull request #1063 from lsst/tickets/DM-45919

DM-45919: Make removeRuns much faster

python/lsst/daf/butler/direct_butler/_direct_butler.py

@@ -1391,11 +1391,19 @@ def removeRuns(self, names: Iterable[str], unstore: bool = True) -> None:
             raise TypeError("Butler is read-only.")
         names = list(names)
         refs: list[DatasetRef] = []
+        all_dataset_types = [dt.name for dt in self._registry.queryDatasetTypes(...)]
         for name in names:
             collectionType = self._registry.getCollectionType(name)
             if collectionType is not CollectionType.RUN:
                 raise TypeError(f"The collection type of '{name}' is {collectionType.name}, not RUN.")
-            refs.extend(self._registry.queryDatasets(..., collections=name, findFirst=True))
+            with self._query() as query:
+                # Work out the dataset types that are relevant.
+                collections_info = self.collections.x_query_info(name, include_summary=True)
+                filtered_dataset_types = self.collections._filter_dataset_types(
+                    all_dataset_types, collections_info
+                )
+                for dt in filtered_dataset_types:
+                    refs.extend(query.datasets(dt, collections=name))
         with self._datastore.transaction(), self._registry.transaction():
             if unstore:
                 self._datastore.trash(refs)