fix(shuffle): Reset outputPos after flushing output buffer in CompressInternal#271
Merged
zhangxffff merged 1 commit intobytedance:mainfrom Feb 27, 2026
Merged
Conversation
guhaiyan0221
pushed a commit
that referenced
this pull request
Mar 4, 2026
guhaiyan0221
pushed a commit
to guhaiyan0221/bolt
that referenced
this pull request
Mar 4, 2026
guhaiyan0221
pushed a commit
to guhaiyan0221/bolt
that referenced
this pull request
Mar 4, 2026
guhaiyan0221
pushed a commit
to guhaiyan0221/bolt
that referenced
this pull request
Mar 4, 2026
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
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.
What problem does this PR solve?
Issue Number: close #270
AdaptiveParallelZstdCodec::CompressInternalhad a stream-state bug: after writing compressed bytes tooutputStream,outputPoswas not reset to0. This could make the next compression iteration run with an effectively exhausted output window (outputLen - outputPos == 0) while keeping stale cursor state, which may produce malformed compressed stream output. On read path, this surfaced asZSTD_decompressStreamfailures (Destination buffer is too small/Data corruption detected) and thenINVALID_STATE. This PR also adds a regression test that reproduces the bug path.Type of Change
Description
Code changes:
bolt/shuffle/sparksql/CompressionStream.hCompressInternal, resetoutputPos = 0immediately afteroutputStream->Write(output, outputPos).Test changes:
bolt/shuffle/sparksql/tests/AdaptiveParallelZstdCodecTest.cppCompressAndFlushStressRoundTripWithoutCorruptionto stress nearZSTD_CStreamInSize()boundaries across multiple rounds/rows.CompressAndFlush+Decompress) and guards against stream corruption regressions.Performance Impact
No Impact: This change does not affect the critical path (e.g., build system, doc, error handling).
Positive Impact: I have run benchmarks.
Click to view Benchmark Results
Negative Impact: Explained below (e.g., trade-off for correctness).
Checklist (For Author)
Breaking Changes
No
Yes (Description: ...)
Click to view Breaking Changes