Avoid creating extraneous merge-trees. #6453
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
|
nice! @rwjblue may complement this nicely broccolijs/broccoli-merge-trees#43 (collapsing merge of merge) |
|
@homu r+ |
|
📌 Commit 380c2ec has been approved by |
homu
added a commit
that referenced
this pull request
Nov 22, 2016
Avoid creating extraneous merge-trees. This change does three main things: * Ensure that we always use `lib/broccoli/merge-trees.js` over requiring `broccoli-merge-trees` directly. * When `lib/broccoli/merge-trees.js` is called with a single input tree, simply return it (instead of creating a `broccoli-merge-tree` instance). * When `mergeTrees` is called with an empty array, use a single `EMPTY_MERGE_TREES` constant instance for all invocations. This prevents us from creating many useless operations to essentially support an "empty" tree. It is possible that we might want to teach Broccoli itself about empty trees, but that is left as a future excercise. The results of these changes even in a newly created empty app are fairly significant. Here are the counts of `tmp` directories created before and after: * 952 - Before changes * 316 - After changes In a real app, these numbers would be even higher (due to addons at each level of nesting). --- Credit goes to @stefanpenner for the idea and initial implementation (which was stolen from #6429).
| options.description = options.annotation; | ||
| var tree = upstreamMergeTrees(inputTree, options); | ||
| module.exports = function mergeTrees(_inputTrees, options) { | ||
| var inputTrees = _inputTrees.filter(Boolean); |
There was a problem hiding this comment.
we may also want to filter out other EmptyMergeTrees here.
| options = options || {}; | ||
| options.description = options.annotation; | ||
| var tree = upstreamMergeTrees(inputTree, options); | ||
| module.exports = function mergeTrees(_inputTrees, options) { |
There was a problem hiding this comment.
we should likely test this guy.
|
@homu r- |
|
☀️ Test successful - status |
|
@stefanpenner - Updated with tests and better filtering when input array contains the |
rwjblue
force-pushed
the
avoid-needless-merge-trees
branch
from
cdf7cb8
to
332c720
Compare
|
@homu r+ |
|
📌 Commit 332c720 has been approved by |
homu
added a commit
that referenced
this pull request
Nov 23, 2016
Avoid creating extraneous merge-trees. This change does three main things: * Ensure that we always use `lib/broccoli/merge-trees.js` over requiring `broccoli-merge-trees` directly. * When `lib/broccoli/merge-trees.js` is called with a single input tree, simply return it (instead of creating a `broccoli-merge-tree` instance). * When `mergeTrees` is called with an empty array, use a single `EMPTY_MERGE_TREES` constant instance for all invocations. This prevents us from creating many useless operations to essentially support an "empty" tree. It is possible that we might want to teach Broccoli itself about empty trees, but that is left as a future excercise. The results of these changes even in a newly created empty app are fairly significant. Here are the counts of `tmp` directories created before and after: * 952 - Before changes * 274 - After changes In a real app, these numbers would be even higher (due to addons at each level of nesting). --- Credit goes to @stefanpenner for the idea and initial implementation (which was stolen from #6429).
|
☀️ Test successful - status |
4 tasks
|
Tested this in Ghost, the tmp dirs created during |
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 change does three main things:
lib/broccoli/merge-trees.jsover requiringbroccoli-merge-treesdirectly.lib/broccoli/merge-trees.jsis called with a single input tree, simply return it (instead of creating abroccoli-merge-treeinstance).mergeTreesis called with an empty array, use a singleEMPTY_MERGE_TREESconstant instance for all invocations. This prevents us from creating many useless operations to essentially support an "empty" tree. It is possible that we might want to teach Broccoli itself about empty trees, but that is left as a future excercise.The results of these changes even in a newly created empty app are fairly significant. Here are the counts of
tmpdirectories created before and after:In a real app, these numbers would be even higher (due to addons at each level of nesting).
Credit goes to @stefanpenner for the idea and initial implementation (which was stolen from #6429).