DM-46339: fix regression in glob detection in query-datasets #1080
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
TallJimbo
force-pushed
the
tickets/DM-46339
branch
from
9a41217
to
bdc0e5f
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #1080 +/- ##
=======================================
Coverage 89.69% 89.69%
=======================================
Files 360 360
Lines 47054 47059 +5
Branches 9660 9661 +1
=======================================
+ Hits 42206 42211 +5
Misses 3480 3480
Partials 1368 1368 ☔ View full report in Codecov by Sentry. |
timj
approved these changes
Sep 16, 2024
| @@ -261,7 +262,7 @@ def getDatasets(self) -> Iterator[list[DatasetRef]]: | |||
| summary_datasets=dataset_types, | |||
| ) | |||
| expanded_query_collections = [c.name for c in query_collections_info] | |||
| if self._find_first and set(query_collections) != set(expanded_query_collections): | |||
| if self._find_first and any(has_globs(c) for c in query_collections): | |||
There was a problem hiding this comment.
Suggested change
| if self._find_first and any(has_globs(c) for c in query_collections): | |
| if self._find_first and has_globs(query_collections): |
has_globs takes an iterable.
CHAINED collections could masquerade as globs with the previous logic. With the new logic, we're probably trying to turn each string into a regex more than one time, but that shouldn't be very expensive.
TallJimbo
force-pushed
the
tickets/DM-46339
branch
from
bdc0e5f
to
b9c8216
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.
CHAINED collections could masquerade as globs with the previous logic. With the new logic, we're probably trying to turn each string into a regex more than one time, but that shouldn't be very expensive.
Checklist
doc/changesconfigs/old_dimensions