Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-31976: Backport to v23 of transfer datasets cleanup #598

Merged
merged 7 commits into from
Nov 9, 2021

Conversation

timj
Copy link
Member

@timj timj commented Nov 9, 2021

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes

By default now configure Butler.transfer_from to not register
dataset types. As part of this reorganization consistency
is now ensured between source butler definitions and target
butler definitions.
Make use of the fact that we know whether the new
dataset type was registered or not.

Also, no longer allow all the dataset types to be
processed before complaining. Raise exception
on first missing dataset type or first inconsistency.
This indicates whether the collection was created or not.
Runs are still created inside the transaction but we now
only call registerRun once per run.
The int->int transfer can randomly end up with clashes if
a second import is attempted, so to remove that randomness
only run the CHAIN test with datasets that we know are in
that collection.  This is needed because we do not
check all the collections up front.
@codecov
Copy link

codecov bot commented Nov 9, 2021

Codecov Report

Merging #598 (178eb95) into v23.0.x (b060b53) will increase coverage by 0.02%.
The diff coverage is 95.31%.

Impacted file tree graph

@@             Coverage Diff             @@
##           v23.0.x     #598      +/-   ##
===========================================
+ Coverage    83.59%   83.61%   +0.02%     
===========================================
  Files          241      241              
  Lines        30309    30352      +43     
  Branches      4509     4519      +10     
===========================================
+ Hits         25336    25380      +44     
+ Misses        3784     3783       -1     
  Partials      1189     1189              
Impacted Files Coverage Δ
python/lsst/daf/butler/registries/remote.py 0.00% <0.00%> (ø)
python/lsst/daf/butler/script/transferDatasets.py 41.17% <0.00%> (ø)
python/lsst/daf/butler/_butler.py 78.66% <95.00%> (+0.42%) ⬆️
python/lsst/daf/butler/cli/cmd/commands.py 90.03% <100.00%> (+0.03%) ⬆️
python/lsst/daf/butler/cli/opt/options.py 100.00% <100.00%> (ø)
python/lsst/daf/butler/registries/sql.py 81.38% <100.00%> (+0.51%) ⬆️
python/lsst/daf/butler/registry/_registry.py 72.98% <100.00%> (ø)
...thon/lsst/daf/butler/registry/collections/_base.py 87.33% <100.00%> (+0.25%) ⬆️
...sst/daf/butler/registry/interfaces/_collections.py 79.20% <100.00%> (ø)
tests/test_butler.py 97.49% <100.00%> (+0.04%) ⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6f9d6c0...178eb95. Read the comment docs.

@timj timj merged commit 8303335 into v23.0.x Nov 9, 2021
@timj timj deleted the tickets/DM-31976-v23 branch November 9, 2021 23:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant