Repository navigation
GH-1491: Release the batch when a C Data stream import fails before taking it #1492
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
sezruby
wants to merge
3
commits into
apache:main
Choose a base branch
from
sezruby:fix/stream-reader-release-on-import-failure
base: main
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
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
Oops, something went wrong.
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.
The PR wraps the 4-argument call:
The 4-argument
Data.importIntoVectorSchemaRootdefaults tocloseImportedStructs = true. Inside the 5-argumentData.importIntoVectorSchemaRoot:importIntoVector(..., closeImportedStructs)which callsarray.close().StructVectorUnloader.getRecordBatch()andVectorLoader.load(recordBatch).If anything throws during unloading or loading (for example, an
OutOfMemoryExceptioninBaseVariableWidthVector.setReaderAndWriterIndexwhen allocating an offset buffer, or anIllegalArgumentExceptioninStructVectorUnloader/VectorLoader), execution enters thecatch (Throwable t)block whilearrayis already closed. Callingarray.snapshot()then hitscheckNotNull(data, "ArrowArray is already closed")inArrowArray.memoryAddress, throwingNullPointerExceptionand masking the original exceptiont.I suggest to pass
closeImportedStructs = falsesince the enclosingtry (ArrowArray array = ArrowArray.allocateNew(allocation))already owns closingarray(this also removes the redundant double-close()on the happy path):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.
Thanks, good catch. Applied in 2d037af: the import now passes
closeImportedStructs = false, so the array stays open for the failure handling and the enclosing try-with-resources closes it once. A failure releasing the batch is added to the original exception as suppressed.I didn't add a test for this path because I couldn't find an input that fails after the import closes the array.
ArrayImporter.importBuffersloads the buffers into the vectors before the array is closed, including allocating a missing validity bitmap. After that, unloading the struct and loading the root only retain the imported buffers.setReaderAndWriterIndexallocates only when the offset buffer holds fewer than length + 1 offsets, and the importer rejects such a buffer. So the allocator-limit sweep in the stream test doesn't reach this path.