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-45860: Do not do the collections query again unless we have to #1073

Merged
merged 3 commits into from
Sep 9, 2024

Conversation

timj
Copy link
Member

@timj timj commented Sep 7, 2024

@andy-slac does this help?

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes
  • (if changing dimensions.yaml) make a copy of dimensions.yaml in configs/old_dimensions

@timj timj force-pushed the tickets/DM-45860-hotfix branch 3 times, most recently from c3cfcef to f63ec81 Compare September 7, 2024 00:30
Copy link

codecov bot commented Sep 7, 2024

Codecov Report

Attention: Patch coverage is 67.30769% with 17 lines in your changes missing coverage. Please review.

Project coverage is 89.64%. Comparing base (aa622dc) to head (8d55d2f).
Report is 4 commits behind head on main.

Files with missing lines Patch % Lines
python/lsst/daf/butler/script/queryDataIds.py 25.00% 10 Missing and 2 partials ⚠️
...on/lsst/daf/butler/script/queryDimensionRecords.py 58.33% 2 Missing and 3 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1073      +/-   ##
==========================================
- Coverage   89.66%   89.64%   -0.02%     
==========================================
  Files         359      359              
  Lines       46687    46727      +40     
  Branches     9600     9609       +9     
==========================================
+ Hits        41860    41888      +28     
- Misses       3468     3478      +10     
- Partials     1359     1361       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@timj timj requested a review from andy-slac September 9, 2024 16:37
@timj
Copy link
Member Author

timj commented Sep 9, 2024

@andy-slac I also realized that I had forgotten to add negative limit support to the dimension-records and data-ids command-lines so I've made that change here. Did the collections fix help you?

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 great.

python/lsst/daf/butler/utils.py Outdated Show resolved Hide resolved
python/lsst/daf/butler/utils.py Outdated Show resolved Hide resolved
@andy-slac
Copy link
Contributor

andy-slac commented Sep 9, 2024

Did the collections fix help you?

Not really, there is a deeper issue when you pass a list of all collection names (mixing all chained and non-chained) to resolve_wildcard method, it blows up by flattening all chains again.

It can be slow to run the query on a list of hundreds of collections
just on the off chance they have wildcards.
…ommand line

This was missed before since we added negative support at the last minute.
We can't actually use that negative support handling because the
command line uses advanced query interface to do the dataset type
joining.
@timj timj merged commit cca901d into main Sep 9, 2024
16 of 18 checks passed
@timj timj deleted the tickets/DM-45860-hotfix branch September 9, 2024 21:50
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.

2 participants