DM-28857 sort collections before pruning in butler prune-collection
#487
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
n8pease
force-pushed
the
tickets/DM-28857
branch
4 times, most recently
from
399e72f
to
0832300
Compare
TallJimbo
approved these changes
Mar 12, 2021
python/lsst/daf/butler/_butler.py
Outdated
| @@ -1156,7 +1156,8 @@ def datasetExists(self, datasetRefOrType: Union[DatasetRef, DatasetType, str], | |||
| ref = self._findDatasetRef(datasetRefOrType, dataId, collections=collections, **kwds) | |||
| return self.datastore.exists(ref) | |||
|
|
|||
| def pruneCollection(self, name: str, purge: bool = False, unstore: bool = False) -> None: | |||
| def pruneCollection(self, name: str, purge: bool = False, unstore: bool = False, | |||
| unlink: Optional[str] = None) -> None: | |||
There was a problem hiding this comment.
Suggested change
| unlink: Optional[str] = None) -> None: | |
| unlink: Optional[List[str]] = None) -> None: |
python/lsst/daf/butler/_butler.py
Outdated
| @@ -1176,6 +1177,9 @@ def pruneCollection(self, name: str, purge: bool = False, unstore: bool = False) | |||
| unstore: `bool`, optional | |||
| If `True`, remove all datasets in the collection from all | |||
| datastores in which they appear. | |||
| unlink: `list` [`str`] | |||
There was a problem hiding this comment.
Suggested change
| unlink: `list` [`str`] | |
| unlink: `list` [`str`], optional |
python/lsst/daf/butler/_butler.py
Outdated
|
|
||
| if (unlink): | ||
| for parent in unlink: | ||
| remove(name, parent) |
There was a problem hiding this comment.
I think we should move this down into the transaction block so the whole thing stays exception-safe.
n8pease
force-pushed
the
tickets/DM-28857
branch
from
0832300
to
ca2e884
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For @TallJimbo, seeing if this approach will work. I'm leaving more notes in the ticket.