-
Notifications
You must be signed in to change notification settings - Fork 700
Ensure that groupKey objects are treated as their groupTarget for the purposes of joins and combines #6139
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
Open
robsyme
wants to merge
5
commits into
master
Choose a base branch
from
groupkey-join-fix
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Ensure that groupKey objects are treated as their groupTarget for the purposes of joins and combines #6139
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
1645098
HashBuilder
robsyme d105842
Ensure GroupKey is preserved and commutative in join/combine
robsyme fc58bec
Cleanup unused methods and code
robsyme c39507a
Pull out the findBestOriginalKeys method
robsyme 145e24d
Merge branch 'master' into groupkey-join-fix
pditommaso File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
113 changes: 113 additions & 0 deletions
113
modules/nextflow/src/test/groovy/nextflow/extension/JoinOpGroupKeyTest.groovy
This file contains hidden or 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,113 @@ | ||
/* | ||
* Copyright 2013-2024, Seqera Labs | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package nextflow.extension | ||
|
||
import nextflow.Channel | ||
import nextflow.Session | ||
import spock.lang.Specification | ||
|
||
/** | ||
* Test GroupKey preservation in join operations | ||
* | ||
* @author Your Name | ||
*/ | ||
class JoinOpGroupKeyTest extends Specification { | ||
|
||
def setup() { | ||
new Session() | ||
} | ||
|
||
def 'should preserve GroupKey when joining channels' () { | ||
given: | ||
def key1 = new GroupKey('X', 2) | ||
def key2 = new GroupKey('Y', 3) | ||
|
||
def ch1 = Channel.of([key1, 1], [key2, 2]) | ||
def ch2 = Channel.of(['X', 'a'], ['Y', 'b']) | ||
|
||
when: | ||
def op = new JoinOp(ch1, ch2) | ||
def result = op.apply().toList().getVal() | ||
|
||
then: | ||
result.size() == 2 | ||
|
||
// Check that GroupKey is preserved in the output | ||
result.each { tuple -> | ||
assert tuple[0] instanceof GroupKey | ||
assert tuple.size() == 3 | ||
} | ||
|
||
// Verify the actual values | ||
def sorted = result.sort { it[0].toString() } | ||
sorted[0][0].toString() == 'X' | ||
sorted[0][0].groupSize == 2 | ||
sorted[0][1] == 1 | ||
sorted[0][2] == 'a' | ||
|
||
sorted[1][0].toString() == 'Y' | ||
sorted[1][0].groupSize == 3 | ||
sorted[1][1] == 2 | ||
sorted[1][2] == 'b' | ||
} | ||
|
||
def 'should preserve GroupKey when GroupKey is on right channel' () { | ||
given: | ||
def key1 = new GroupKey('X', 2) | ||
def key2 = new GroupKey('Y', 3) | ||
|
||
def ch1 = Channel.of(['X', 'a'], ['Y', 'b']) | ||
def ch2 = Channel.of([key1, 1], [key2, 2]) | ||
|
||
when: | ||
def op = new JoinOp(ch1, ch2) | ||
def result = op.apply().toList().getVal() | ||
|
||
then: | ||
result.size() == 2 | ||
|
||
// Check that GroupKey is preserved in the output | ||
result.each { tuple -> | ||
assert tuple[0] instanceof GroupKey | ||
assert tuple.size() == 3 | ||
} | ||
} | ||
|
||
def 'should handle mix of GroupKey and plain keys correctly' () { | ||
given: | ||
def key1 = new GroupKey('X', 2) | ||
|
||
def ch1 = Channel.of([key1, 1], ['Y', 2]) // Mix of GroupKey and plain key | ||
def ch2 = Channel.of(['X', 'a'], ['Y', 'b']) | ||
|
||
when: | ||
def op = new JoinOp(ch1, ch2) | ||
def result = op.apply().toList().getVal().sort { it[0].toString() } | ||
|
||
then: | ||
result.size() == 2 | ||
|
||
// First tuple should have GroupKey | ||
result[0][0] instanceof GroupKey | ||
result[0][0].toString() == 'X' | ||
result[0][0].groupSize == 2 | ||
|
||
// Second tuple should have plain string | ||
result[1][0] == 'Y' | ||
!(result[1][0] instanceof GroupKey) | ||
} | ||
} |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sounds very reasonable, it may be worth adding a unit test
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed. Will fix that today.