Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Make ByteSourceJsonBootstrapper use StringReader for < 8KiB byte[] inputs #1081

Merged
merged 3 commits into from
Aug 18, 2023
Merged

Make ByteSourceJsonBootstrapper use StringReader for < 8KiB byte[] inputs #1081

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
053fd09
ByteSourceJsonBootstrapper uses StringReader for < 8KiB byte[] inputs
schlosna Aug 10, 2023
f525c86
Clarify 8KiB byte array length limit
schlosna Aug 11, 2023
a515382
Skip greater than zero check
schlosna Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/com/fasterxml/jackson/core/json/ByteSourceJsonBootstrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,12 @@ public Reader constructReader() throws IOException
InputStream in = _in;

if (in == null) {
int length = _inputEnd - _inputPtr;
if (length >= 0 && length <= 8192) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor nit: It may not be worth checking length >= 0. It has a small perf impact and the length is very unlikely to negative and will just fail at the ByteArrayInputStream stage anyway. The length == 0 case will probably be more tidily handled with the StringReader than the ByteArrayInputStream route.

Copy link
Contributor Author

@schlosna schlosna Aug 11, 2023 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I flipped the condition to short circuit for large inputs first if (length <= STRING_READER_BYTE_ARRAY_LENGTH_LIMIT && length >= 0).

I'd prefer to keep the length >= 0 as the array length check here should be negligible, and ensures the ByteInputStream continues handling any negative array length path.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After thinking it through over night, I removed the length >= 0 condition.

// [jackson-core#488] Avoid overhead of heap ByteBuffer allocated by InputStreamReader
// when processing small inputs up to 8KiB.
return new StringReader(new String(_inputBuffer, _inputPtr, length, enc.getJavaName()));
}
in = new ByteArrayInputStream(_inputBuffer, _inputPtr, _inputEnd);
} else {
/* Also, if we have any read but unused input (usually true),
Expand Down