Fix #8646 for faster find of all files #8815
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
…ies first and then apply Rubocop Exclude on directories before finding files
|
Nicely done! I think it's the first time I see someone sharing flamegraphs in a PR which is extra cool! I always think of @miharekar when I see a flamegraph (a friend of mine, who's a big proponent of the concept). |
8 tasks
Tonkpils
added a commit
to Tonkpils/rubocop
that referenced
this pull request
Apr 29, 2021
rubocop#8815 introduced a traversal strategy that used recursion. rubocop#9703 then fixed an issue with this traversal which accounted for directories and symlinks. When a symlink points to a parent directory that contains that symlink it'll cause this to go into a loop until the filename is too long for glob to handle. We prevent this by checking for the inclusion of a symlink's real path in the base directory's realpath. If the base directory's path starts with the symlink's destination then we are in a loop and should skip processing the directory
bbatsov
pushed a commit
that referenced
this pull request
May 3, 2021
#8815 introduced a traversal strategy that used recursion. #9703 then fixed an issue with this traversal which accounted for directories and symlinks. When a symlink points to a parent directory that contains that symlink it'll cause this to go into a loop until the filename is too long for glob to handle. We prevent this by checking for the inclusion of a symlink's real path in the base directory's realpath. If the base directory's path starts with the symlink's destination then we are in a loop and should skip processing the directory
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.
After sleeping on it, I realized there was a simpler (less code) and slightly faster version of the previous #8806.
By recursively getting all directories and then at each directory level testing Rubocop Exclude on directories. Once directories are found at all levels, we search for files.
In addition, I replaced many of the
base_dirstring concatenations with the saferFile#join.Benchmarks on a large project removes an additional 500+ milliseconds.
The following flamegraphs illustrate the percentage of processing
TargetFinder#target_files_in_dirtook in using the commandbundle exec rubocop -Lto list rubocop files.Original Flamegraph
Changes from #8806
Changes from this MR
Note: I didn't add an entry to the Changelog as a previous one was already added.
Before submitting the PR make sure the following are checked:
[Fix #issue-number](if the related issue exists).master(if not - rebase it).bundle exec rake default. It executes all tests and RuboCop for itself, and generates the documentation.