-
Notifications
You must be signed in to change notification settings - Fork 759
Fix caching of task ext properties with the strict parser #6696
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
bentsherman
wants to merge
1
commit into
master
Choose a base branch
from
6695-fix-task-ext-resume
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.
Conversation
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
Signed-off-by: Ben Sherman <[email protected]>
✅ Deploy Preview for nextflow-docs-staging canceled.
|
jorgee
reviewed
Jan 2, 2026
Comment on lines
+98
to
+113
| private static String asPropertyChain(PropertyExpression node) { | ||
| var builder = new StringBuilder(); | ||
| builder.append(node.getPropertyAsString()); | ||
|
|
||
| var target = node.getObjectExpression(); | ||
| while( target instanceof PropertyExpression pe ) { | ||
| builder.append('.'); | ||
| builder.append(pe.getPropertyAsString()); | ||
| target = pe.getObjectExpression(); | ||
| } | ||
|
|
||
| builder.append('.'); | ||
| builder.append(target.getText()); | ||
|
|
||
| return builder.reverse().toString(); | ||
| } |
Contributor
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.
The reverse in last statement is reversing the full stringbuilder getting something like ksat.txe.sgra. I think you wanted to just reverse the order of elements of a list of strings and join with . later.
Suggested change
| private static String asPropertyChain(PropertyExpression node) { | |
| var builder = new StringBuilder(); | |
| builder.append(node.getPropertyAsString()); | |
| var target = node.getObjectExpression(); | |
| while( target instanceof PropertyExpression pe ) { | |
| builder.append('.'); | |
| builder.append(pe.getPropertyAsString()); | |
| target = pe.getObjectExpression(); | |
| } | |
| builder.append('.'); | |
| builder.append(target.getText()); | |
| return builder.reverse().toString(); | |
| } | |
| private static String asPropertyChain(PropertyExpression node) { | |
| var list = new ArrayList<String>(); | |
| list.add(node.getPropertyAsString()); | |
| var target = node.getObjectExpression(); | |
| while( target instanceof PropertyExpression pe ) { | |
| list.add(pe.getPropertyAsString()); | |
| target = pe.getObjectExpression(); | |
| } | |
| list.add(target.getText()); | |
| Collections.reverse(list); | |
| return String.join(".", list); | |
| } |
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.
Close #6695
This PR updates the strict parser to collect references to
task.ext.*so that they are added to the task hash (docs).I originally thought to move the
VariableVisitorintonf-langso that it is re-used by both, but I think this visitor does a lot of unnecessary work, and I didn't want to alter the old parser too much, so I just created a separate implementation for the strict parser that is much simpler. It only collects references totask.ext.*instead of all variable references.Note to self: once we make the strict parser the default (#6643), we should revisit the runtime layer and how it handles these variable references. I think it could be simplified quite a bit.