fix: Dont generate the same file multiple times & fix CreateTextFile #4356
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
timtebeek
approved these changes
Jul 25, 2024
| @@ -86,7 +86,7 @@ public TreeVisitor<?, ExecutionContext> getVisitor(AtomicBoolean created) { | |||
| @Override | |||
| public SourceFile visit(@Nullable Tree tree, ExecutionContext ctx) { | |||
| SourceFile sourceFile = (SourceFile) requireNonNull(tree); | |||
| if ((created.get() || Boolean.TRUE.equals(overwriteExisting)) && path.equals(sourceFile.getSourcePath())) { | |||
There was a problem hiding this comment.
Weird how we were overwriting the content again, even after already initializing with file contents.
Comment on lines
115
to
119
| for (SourceFile source : generated) { | ||
| if (acc.stream().noneMatch(s -> s.getSourcePath().equals(source.getSourcePath()))) { | ||
| acc.add(source); | ||
| } | ||
| } |
There was a problem hiding this comment.
Gave me a bit of pause to loop over all generated files in a list before adding a new entry, but I think it's tolerable given the expected low volume of generated files.
There was a problem hiding this comment.
Change the reduction operation to use a Set generated from a TreeMap whose comparator is the source path.
There was a problem hiding this comment.
I updated to using TreeSet. This does mean that the insertion order is no longer guaranteed to be the resulting order, although I can imagine that the LST order is also similarly ordered anyway?
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.
What's changed?
generate no longer creates files at the same path multiple times
What's your motivation?
Currently the same file can be created multiple times, causing instabilities in recipe execution. For instance
running
CreateTextFiletwice in the same run causes multiple cycles changing back and forth from 1 text to the other, even ifoverwriteExistingis falseAnything in particular you'd like reviewers to focus on?
This is a change in the core recipe running and might have unwanted side-effects
Anyone you would like to review specifically?
@sambsnyd @timtebeek
Have you considered any alternatives or workarounds?
Fixing it on the recipe level alone, but this would require "rescanning" during the edit phase.
Checklist