-
Notifications
You must be signed in to change notification settings - Fork 122
unmarshaller performance: use bulk operations instead of charAt() where possible #1873
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
winfriedgerlach
wants to merge
1
commit into
eclipse-ee4j:master
Choose a base branch
from
winfriedgerlach:improve-perfomance-of-unmarshaller
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ | |
|
|
||
| package org.glassfish.jaxb.runtime.v2.runtime.unmarshaller; | ||
|
|
||
| import org.glassfish.jaxb.runtime.v2.runtime.output.Pcdata; | ||
| import org.glassfish.jaxb.runtime.v2.util.FatalAdapter; | ||
| import org.glassfish.jaxb.core.v2.runtime.unmarshaller.LocatorEx; | ||
| import org.xml.sax.SAXException; | ||
|
|
@@ -99,8 +100,25 @@ public void text( CharSequence pcdata ) throws SAXException { | |
| if(buf.length<len) { | ||
| buf = new char[len]; | ||
| } | ||
| for( int i=0;i<len; i++ ) | ||
| buf[i] = pcdata.charAt(i); // isn't this kinda slow? | ||
|
|
||
| // performance optimization: use getChars()/writeTo() if possible | ||
| // note: this will become just pcdata.getChars() once minimum supported JDK version reaches 25 (cf. JDK-8343110) | ||
| if (pcdata instanceof String) { | ||
| ((String) pcdata).getChars(0, len, buf, 0); | ||
| } | ||
| else if (pcdata instanceof StringBuilder) { | ||
| ((StringBuilder) pcdata).getChars(0, len, buf, 0); | ||
| } | ||
| else if (pcdata instanceof StringBuffer) { | ||
| ((StringBuffer) pcdata).getChars(0, len, buf, 0); | ||
| } | ||
| else if (pcdata instanceof Pcdata) { | ||
| ((Pcdata) pcdata).writeTo(buf, 0); | ||
|
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. looking at the implementation, this should give massive gains for |
||
| } | ||
| else { | ||
| for (int i = 0; i < len; i++) | ||
| buf[i] = pcdata.charAt(i); // this is slow due to O(n) range checks | ||
| } | ||
|
|
||
| validator.characters(buf,0,len); | ||
| if(predictor.expectText()) | ||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you use
instanceof AbstractStringBuildersince it's extented by bothStringBuilderandStringBuffer?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would like to but that class is not public...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oups, yes you're right :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CharSequenceis what you need, implemented byString,StringBuilder,StringBuffer...There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes but
getCharsThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, sorry.
getCharsis there since JDK 25 only. I did miss that.