-
Notifications
You must be signed in to change notification settings - Fork 123
GH-1125: Read empty ListVector correctly using UnionListReader after IPC deser #1136
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
bodduv
wants to merge
5
commits into
apache:main
Choose a base branch
from
bodduv:arrow-java/GH-1125-empty-list-reader-position
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
5 commits
Select commit
Hold shift + click to select a range
e889d0e
Handle empty union list readers after IPC deser
bodduv 3321c85
Address union list reader review feedback
bodduv ff04d15
Apply reader bounds checks to list view readers
bodduv 5d1aa38
Use list view accessors in union readers
bodduv b1c2bb6
Document large list view element size accessor
bodduv 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
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
72 changes: 72 additions & 0 deletions
72
.../src/main/java/org/apache/arrow/vector/complex/impl/UnionListReaderPositionValidator.java
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 |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.arrow.vector.complex.impl; | ||
|
|
||
| import org.apache.arrow.memory.ArrowBuf; | ||
|
|
||
| /** | ||
| * Utility class for validating list and list view reader positions. | ||
| * | ||
| * <p>A list vector contains an offset buffer that denotes lists boundaries. A list view vector | ||
| * contains an offset buffer and a size buffer. | ||
| */ | ||
| final class UnionListReaderPositionValidator { | ||
|
|
||
| private UnionListReaderPositionValidator() {} | ||
|
|
||
| /** Check if the given index is within the current value count of the vector. */ | ||
| static void checkIndex(int index, int valueCount) { | ||
| if (index < 0 || index >= valueCount) { | ||
| throw new IndexOutOfBoundsException( | ||
| String.format("index: %s, expected range [0, %s)", index, valueCount)); | ||
| } | ||
| } | ||
|
|
||
| /** Check that the list offset buffer contains entries for {@code index} and {@code index + 1}. */ | ||
| static void checkListBufferReadable(ArrowBuf offsetBuffer, int index, long offsetWidth) { | ||
| long requiredBytes = ((long) index + 2L) * offsetWidth; | ||
| long capacity = offsetBuffer.capacity(); | ||
| if (capacity < requiredBytes) { | ||
| throw new IndexOutOfBoundsException( | ||
| String.format( | ||
| "Offset buffer has capacity %s but reading index %s requires %s bytes", | ||
| capacity, index, requiredBytes)); | ||
| } | ||
| } | ||
|
|
||
| /** Check that the list view offset and size buffers contain entries for {@code index}. */ | ||
| static void checkListViewBufferReadable( | ||
| ArrowBuf offsetBuffer, ArrowBuf sizeBuffer, int index, long offsetWidth, long sizeWidth) { | ||
| long requiredOffsetBytes = ((long) index + 1L) * offsetWidth; | ||
| long offsetCapacity = offsetBuffer.capacity(); | ||
| if (offsetCapacity < requiredOffsetBytes) { | ||
| throw new IndexOutOfBoundsException( | ||
| String.format( | ||
| "Offset buffer has capacity %s but reading index %s requires %s bytes", | ||
| offsetCapacity, index, requiredOffsetBytes)); | ||
| } | ||
|
|
||
| long requiredSizeBytes = ((long) index + 1L) * sizeWidth; | ||
| long sizeCapacity = sizeBuffer.capacity(); | ||
| if (sizeCapacity < requiredSizeBytes) { | ||
| throw new IndexOutOfBoundsException( | ||
| String.format( | ||
| "Size buffer has capacity %s but reading index %s requires %s bytes", | ||
| sizeCapacity, index, requiredSizeBytes)); | ||
| } | ||
| } | ||
| } |
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.
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.
Uh oh!
There was an error while loading. Please reload this page.