Improve Status performance with many ignored files #1379
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
Fix loading of `.gitignore` files in nested ignored directories. These were not matched in the current implementation, as that only checks the ignores of the current directory. As a side-effect this change also leads to significantly improved performance: in a repository with 3M ignored files `Status` now takes 160 s instead of 491 s.
Skip ignored files when walking through the worktree. This signigifantly improves the performance of `Status()`: In a repository with 3M ignored files `Status` now takes 5 s instead of 160 s.
|
@silkeh thanks for proposing this PR. Although this may improve the use case of multiple ignored files, it seems to cause a regression when that is not the case. I did a quick benchmark testing a call to I am struggling for time to pinpoint optimisation areas in the PR, would you be able to optimise it for the standard use case as well? |
|
@pjbgf: Thanks for taking a look! I'll take a look later this week and see what I can improve. |
|
@onee-only: That was the plan, but I've been busy with other things. I'll try to make some time next week. |
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 contains two changes that significantly improve the performance of
WorkTree.Status()(from 491 s to 5 s):This signigifantly improves the performance of
Status():In a repository with 3M ignored files
Statusnow takes 5 s instead of 160 s..gitignorefiles in nested ignored directories.These were not matched in the current implementation, as that only checks the ignores of the current directory.
As a side-effect this change also leads to significantly improved performance: in a repository with 3M ignored files
Statusnow takes 160 s instead of 491 s.I have a backport to
masterready if desired.