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-32454: Separate dataset dimensions from requested dimensions in queries. #593

Merged
merged 1 commit into from Nov 5, 2021

Conversation

TallJimbo
Copy link
Member

@TallJimbo TallJimbo commented Nov 4, 2021

Checklist

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

@codecov
Copy link

codecov bot commented Nov 4, 2021

Codecov Report

Merging #593 (b2aa584) into master (86adc55) will decrease coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #593      +/-   ##
==========================================
- Coverage   83.52%   83.51%   -0.01%     
==========================================
  Files         241      241              
  Lines       30256    30266      +10     
  Branches     4518     4520       +2     
==========================================
+ Hits        25270    25277       +7     
- Misses       3790     3793       +3     
  Partials     1196     1196              
Impacted Files Coverage Δ
python/lsst/daf/butler/registries/sql.py 81.46% <ø> (-0.08%) ⬇️
...ython/lsst/daf/butler/registry/queries/_builder.py 87.89% <100.00%> (ø)
...ython/lsst/daf/butler/registry/queries/_results.py 80.36% <100.00%> (+0.24%) ⬆️
...ython/lsst/daf/butler/registry/queries/_structs.py 87.87% <100.00%> (+0.30%) ⬆️
python/lsst/daf/butler/registry/tests/_registry.py 98.93% <100.00%> (+<0.01%) ⬆️
python/lsst/daf/butler/registry/queries/_query.py 81.13% <0.00%> (-0.95%) ⬇️

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 86adc55...b2aa584. Read the comment docs.

Copy link
Contributor

@andy-slac andy-slac left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, couple of minor comments.

python/lsst/daf/butler/registry/queries/_structs.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/registry/queries/_structs.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/registry/tests/_registry.py Outdated Show resolved Hide resolved
The dimensions passed directly to queryDataIds were always intended to
be the dimensions the caller wanted back, which may not be the same as
the dimensions used to constrain the query.  We'd partially handled
that distinction in the past, but we had been rolling dataset
constraint dimensions into the requested set.  This was most obvious
in queryDimensionRecords, which didn't quite handle this properly, and
hence couldn't handle constraints on datasets that have dimensions
beyond the dimension records' own.  Fixing queryDataIds to track
dataset-constraint dimensions separately solves that problem, too.
@TallJimbo TallJimbo merged commit a8150d9 into master Nov 5, 2021
@TallJimbo TallJimbo deleted the tickets/DM-32454 branch November 5, 2021 19:23
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

2 participants