Support StreamReadConstraints.maxDocumentLength and maxTokenCount in Avro parser - #796
Merged
cowtowncoder merged 5 commits intoSep 19, 2026
Merged
Conversation
…Avro parser (#785) - AvroParserImpl.nextToken(): route through _nullSafeUpdateToken() so tokens are counted (nextFieldName() variants already did this) - JacksonAvroParserImpl: validate document length on buffer reload - AvroFactory / ApacheAvroFactory: validate document length up front for byte[] input - ApacheAvroParserImpl: wrap the InputStream in a byte-counting stream (only when maxDocumentLength is set), since the Apache BinaryDecoder does its own buffering Backport of #786 (3.x) to 2.18. Co-Authored-By: PJ Fanning <pjfanning@users.noreply.github.com> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
cowtowncoder
changed the title
StreamReadConstraints.maxDocumentLength and maxTokenCount in Avro parser (2.18)StreamReadConstraints.maxDocumentLength and maxTokenCount in Avro parser
cowtowncoder
deleted the
tatu-claude/2.18/785-avro-doc-len-token-count
branch
September 19, 2026 03:00
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Re-creation of #786 (3.x) to
2.18, for 2.18.11. Fixes #785.maxTokenCount:AvroParserImpl.nextToken()now goes through_nullSafeUpdateToken()instead of assigning_currTokendirectly, so tokens are counted and the limit enforced (thenextFieldName()variants already did this). 2.x has nonextNameMatch(), so that part of #786 does not apply.maxDocumentLength, matching CBOR/Smile/Protobuf (#783):JacksonAvroParserImpl._loadMore()/_loadToHaveAtLeast():validateDocumentLength(_currInputProcessed)on buffer reloadAvroFactory._createParser(byte[], int, int, IOContext):validateDocumentLength(len)up front. Unlike 3.x — where one method covers both decoders —ApacheAvroFactoryoverrides this on 2.x, so the check is added there too.ApacheAvroParserImpl(streaming): the ApacheBinaryDecoderreads from theInputStreamitself, so the stream is wrapped in a small byte-countingFilterInputStreamthat validates as bytes are pulled. Only wrapped whenhasMaxDocumentLength(), so no overhead by default.Tests:
dos/TokenCountAvroReadTestanddos/LongDocumentAvroReadTest, each covering Jackson and Apache decoders ×byte[]andInputStreaminput. Ported to the 2.xjunit.framework.TestCasestyle used byAvroTestBase. 3 of the 4 fail without the main-code changes (the fourth is the no-constraint regression guard).Note: on 2.18 the Apache decoder has to be selected with
new ApacheAvroFactory()—AvroFactory.builderWithApacheDecoder()setsAvroFactoryBuilder._useApacheLibDecoderbutAvroFactory._createParser()never reads it, so the builder path silently yields the native decoder. Pre-existing, unrelated to this PR, but worth a separate issue.Full
avromodule suite passes (1455 tests, 0 failures).Release notes add a
2.18.11 (not yet released)section; #783's branch adds the same header, so whichever merges second will need a one-line conflict resolution there.🤖 Generated with Claude Code