Mergeup of #625 #983
Merged
Mergeup of #625 #983
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
In a real world project with many submodules and particularly a module that has dependencies to other modules, the generated reports can be quite heavy (100MB+). When these reports are parsed using current XML parser, report aggregation fails with GC overhead limit or OutOfMemoryError due to loading of the whole XML data in memory. The new implementation uses StAX in order to avoid loading the whole XML data in memory.
Conflicts: pitest-aggregator/src/main/java/org/pitest/aggregate/BlockCoverageDataLoader.java pitest-aggregator/src/main/java/org/pitest/aggregate/DataLoader.java pitest-aggregator/src/main/java/org/pitest/aggregate/MutationResultDataLoader.java Conflicting changes were from: afba928 - collapsing catch blocks. These are removed in the branch anyway, so no change to branch to resolve the conflict - we just take the branch version 8193731 - Removing methodName class. This change has been reflected in the branch
|
Thanks @therealryan. The tests around this area of the code are minimal, but that is an existing issue from when this feature was first added. If you can confirm that everthing works as expected when run against a real project I'll merge it in. |
|
After:
I can confirm that report aggregation works as expected. |
|
@therealryan Thanks, merged now. |
|
Great stuff! All credit to @aurelien-baudet ! |
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 is the same changeset as the apparently-stalled #625, but with merge conflicts resolved
The conflicts turned out to be simple:
MethodNameclass has been removed, so no need to callMethodName.fromString()(orname()in the tests)