Speedup Xcbeautify by applying frequency-based pattern matching. #67
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
PaulTaykalo
commented
Feb 24, 2022
|
|
||
| private let colored: Bool | ||
|
|
||
| private let additionalLines: () -> String? |
There was a problem hiding this comment.
Moved parameters to the Parser itself out of the method, which should return beautified string
PaulTaykalo
commented
Feb 24, 2022
|
|
||
| private let colored: Bool | ||
|
|
||
| private let additionalLines: () -> String? |
There was a problem hiding this comment.
Moved parameters to the Parser itself out of the method, which should return beautified string
PaulTaykalo
changed the title
PaulTaykalo
commented
Feb 24, 2022
| @@ -41,7 +41,7 @@ enum Pattern: String { | |||
|
|
|||
| /// Regular expression captured groups: | |||
| /// $1 = file | |||
| case codesign = #"CodeSign\s((?:\ |[^ ])*)$"# | |||
| case codesign = #"CodeSign\s(((?!.framework/Versions/A)(?:\ |[^ ]))*)$"# | |||
There was a problem hiding this comment.
since now, whichever patter matches first is winning, we need to make sure that codesign pattern will not 'eat' codesignFramework pattern
|
@thii ^^ |
thii
approved these changes
Feb 25, 2022
PaulTaykalo
force-pushed
the
feature/speedup-xcbeautify
branch
from
cbaab6c
to
2bb2569
Compare
|
Fixed suggestions. |
|
Sorry I just merged a PR that introduced some conflicts here. Would you be able to fix them? |
|
Yep. Sure |
PaulTaykalo
force-pushed
the
feature/speedup-xcbeautify
branch
from
2bb2569
to
4ca5e33
Compare
Add tests for some inconsistent parsing of signing Fix cases with signing ordering Update Sources/XcbeautifyLib/Parser.swift Co-authored-by: Thi Doãn <t@thi.im> Update Tests/XcbeautifyLibTests/XcbeautifyLibTests.swift Co-authored-by: Thi Doãn <t@thi.im>
PaulTaykalo
force-pushed
the
feature/speedup-xcbeautify
branch
from
4ca5e33
to
f5109f0
Compare
|
@thii done |
PaulTaykalo
commented
Feb 27, 2022
| @@ -12,6 +12,7 @@ class Regex { | |||
| } | |||
|
|
|||
| func match(string: String) -> Bool { | |||
| return matcher?.numberOfMatches(in: string, range: NSRange(location: 0, length: string.count)) != 0 | |||
| let fullRange = NSRange(string.startIndex..., in: string) | |||
| return matcher?.rangeOfFirstMatch(in: string, range: fullRange).location != NSNotFound | |||
There was a problem hiding this comment.
even faster variant, with correct range calculation
|
Thanks @PaulTaykalo! |
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.
The current implementation of xcbeautify performs regex checking for each line of the xcodebuild output.
Due to the big amount of possible regexes, each line on average is checked for about
N/2times. which is a lotSuggested implementation holds an array of 'inner parser' and try to reuse 'line parser/matchers' using frequency based array (basically, last matcher regex will be checked first).
Due to the non-random structure of xcodebuil output, this approach allows to decrease
xcbeautifyrunning time from 160 s to 9 seconds when used on the xcodebuild output of size 240MbTesting approach:
time cat LOGFILE | xcbeauitifyPossible 'bugs'
If there are multiple regexes which can match same line, this approach could return different results, depending on the order of the commands, appeared in log
Xcbeautify Speed
It seems that xcbeautify is waaaay slower than xcpretty. This PR will actually make xcbeautify faster