fix issue that causes illegal diff query #5291
Merged
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
github-actions
bot
added
the
group/backend
CodSpeed Performance ReportMerging #5291 will not alter performanceComparing Summary
|
ajtmccarty
commented
Dec 20, 2024
| # keep the diff that covers the larger time frame | ||
| if candidate_interval > previous_interval: | ||
| ordered_diffs_no_overlaps[-1] = candidate_diff_pair | ||
| return ordered_diffs_no_overlaps |
There was a problem hiding this comment.
strip out overlapping diffs. when two diffs overlap, keep the one that covers the greater time range
| remaining_diffs = sorted(partial_enriched_diffs, key=lambda d: d.diff_branch_diff.from_time) | ||
| ordered_diffs = self._get_ordered_diff_pairs(diff_pairs=partial_enriched_diffs, allow_overlap=False) | ||
| ordered_diff_reprs = [repr(d) for d in ordered_diffs] | ||
| log.debug(f"Ordered diffs for aggregation: {ordered_diff_reprs}") |
There was a problem hiding this comment.
a little logging to help us troubleshoot if this comes up again
| if sorted_time_ranges[-1].to_time < to_time: | ||
| missing_time_ranges.append(TimeRange(from_time=sorted_time_ranges[-1].to_time, to_time=to_time)) | ||
| return missing_time_ranges | ||
|
|
| AND ( | ||
| (from_time <= diff_rel.from < $to_time) | ||
| OR (from_time <= diff_rel.to < $to_time) | ||
| ) |
There was a problem hiding this comment.
fix in the query to calculate a diff
| assert property_diff.previous_value is False | ||
| assert property_diff.new_value is None | ||
| assert property_diff.action is DiffAction.REMOVED | ||
| assert before_main_change < property_diff.changed_at < after_main_change |
There was a problem hiding this comment.
fix to this unit test after the fix to the diff query
dgarros
approved these changes
Dec 21, 2024
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.
IFC-1013
when aggregating multiple diffs as part of a diff update, if any diffs in the aggregation list overlapped it would cause an illegal diff query to be created in which the
to_timewas before thefrom_timethis fix is to go through the list of diffs to aggregate and remove any that overlap, giving preference to the diff that covers the greater time range
also fixes a small bug in the diff query that could cause a diff for an arbitrary time frame (meaning a
to_timeother than "right now") to not include changes. this is not something a user would encounter unless they are using GraphQL to generate their own diffs with arbitrary time ranges outside of the branch/proposed change process. and I highly doubt anyone is doing that