fix(universe): fix SortLimit for empty input group #4701
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
wolffcm
requested review from
Marwes and
jstirnaman
and removed request for
a team
Marwes
approved these changes
Apr 27, 2022
stdlib/universe/sort.go
Outdated
| @@ -331,6 +331,14 @@ func (s *sortTableMergeHeap) ValueLen() int { | |||
| } | |||
|
|
|||
| func (s *sortTableMergeHeap) Table(limit int, mem memory.Allocator) (flux.Table, error) { | |||
| if s.ValueLen() == 0 { | |||
| // Degenerate case where ther are no rows to merge sort | |||
There was a problem hiding this comment.
Suggested change
| // Degenerate case where ther are no rows to merge sort | |
| // Degenerate case where there are no rows to merge sort |
added 2 commits
April 27, 2022 11:48
jsternberg
added a commit
that referenced
this pull request
Sep 19, 2022
The sort limit code did not skip chunks with no rows which caused it to attempt to compare invalid chunks with each other. This skips those rows but still ensures that the schema is created for them. This is similar to the same problem that was identified in #4701. That PR only addressed when the last or only chunk was zero while this one ensures that the aggregation step also handles this situation properly.
5 tasks
jsternberg
added a commit
that referenced
this pull request
Sep 20, 2022
The sort limit code did not skip chunks with no rows which caused it to attempt to compare invalid chunks with each other. This skips those rows but still ensures that the schema is created for them. This is similar to the same problem that was identified in #4701. That PR only addressed when the last or only chunk was zero while this one ensures that the aggregation step also handles this situation properly.
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.
This PR adds a bit of logic to our handling of
sort |> limitto catch the case where we have received an empty table. The code the does merging did not expect to have to deal with zero-row tables, and wound up in an infinite loop.Done checklist