Skip to content

GH-964: Fix IndexOutOfBoundsException in Array.getResultSet() for JDBC clients #965

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

Open
xborder wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −15
Open

GH-964: Fix IndexOutOfBoundsException in Array.getResultSet() for JDBC clients #965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d36364a
fix returned ResultSet for Arrays
xborder Jan 12, 2026
ca25fbc
test fixes
xborder Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions ...flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.arrow.driver.jdbc.utils.SqlTypes;
import org.apache.arrow.memory.util.LargeMemoryUtil;
import org.apache.arrow.vector.FieldVector;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.arrow.vector.types.pojo.ArrowType;
Expand Down Expand Up @@ -135,12 +136,22 @@ public ResultSet getResultSet(long index, int count) throws SQLException {

private static ResultSet getResultSetNoBoundariesCheck(
ValueVector dataVector, long start, long count) throws SQLException {
int intStart = LargeMemoryUtil.checkedCastToInt(start);
int intCount = LargeMemoryUtil.checkedCastToInt(count);

// Create an index vector with 1-based indices (per JDBC spec) to return with value vector
IntVector indexVector = new IntVector("INDEX", dataVector.getAllocator());
indexVector.allocateNew(intCount);
for (int i = 0; i < intCount; i++) {
indexVector.set(i, i + 1);
}
indexVector.setValueCount(intCount);

TransferPair transferPair = dataVector.getTransferPair(dataVector.getAllocator());
transferPair.splitAndTransfer(
LargeMemoryUtil.checkedCastToInt(start), LargeMemoryUtil.checkedCastToInt(count));
FieldVector vectorSlice = (FieldVector) transferPair.getTo();
transferPair.splitAndTransfer(intStart, intCount);
FieldVector valueVector = (FieldVector) transferPair.getTo();

VectorSchemaRoot vectorSchemaRoot = VectorSchemaRoot.of(vectorSlice);
VectorSchemaRoot vectorSchemaRoot = VectorSchemaRoot.of(indexVector, valueVector);
return ArrowFlightJdbcVectorSchemaRootResultSet.fromVectorSchemaRoot(vectorSchemaRoot);
}

Expand Down
4 changes: 2 additions & 2 deletions ...ht-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcArrayTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void testShouldGetResultSetReturnValidResultSet() throws SQLException {
try (ResultSet resultSet = arrowFlightJdbcArray.getResultSet()) {
int count = 0;
while (resultSet.next()) {
assertEquals((Object) resultSet.getInt(1), dataVector.getObject(count));
assertEquals((Object) resultSet.getInt(2), dataVector.getObject(count));
count++;
}
}
Expand All @@ -142,7 +142,7 @@ public void testShouldGetResultSetReturnValidResultSetWithOffsets() throws SQLEx
try (ResultSet resultSet = arrowFlightJdbcArray.getResultSet(3, 5)) {
int count = 0;
while (resultSet.next()) {
assertEquals((Object) resultSet.getInt(1), dataVector.getObject(count + 3));
assertEquals((Object) resultSet.getInt(2), dataVector.getObject(count + 3));
count++;
}
assertEquals(5, count);
Expand Down
7 changes: 6 additions & 1 deletion ...ache/arrow/driver/jdbc/accessor/impl/complex/AbstractArrowFlightJdbcListAccessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,12 @@ public void testShouldGetArrayGetResultSetReturnValidResultSet(
try (ResultSet rs = array.getResultSet()) {
int count = 0;
while (rs.next()) {
final int value = rs.getInt(1);
// Column 1: 1-based index (per JDBC spec)
final int index = rs.getInt(1);
assertThat(index, equalTo(count + 1));

// Column 2: actual value (per JDBC spec)
final int value = rs.getInt(2);
assertThat(value, equalTo(currentRow * count));
count++;
}
Expand Down
16 changes: 8 additions & 8 deletions .../apache/arrow/driver/jdbc/accessor/impl/complex/ArrowFlightJdbcMapVectorAccessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,15 +153,15 @@ public void testShouldGetArrayReturnValidArray() throws SQLException {

try (ResultSet resultSet = array.getResultSet()) {
assertTrue(resultSet.next());
Map<?, ?> entry = resultSet.getObject(1, Map.class);
Map<?, ?> entry = resultSet.getObject(2, Map.class);
assertEquals(1, entry.get("key"));
assertEquals(11, entry.get("value"));
assertTrue(resultSet.next());
entry = resultSet.getObject(1, Map.class);
entry = resultSet.getObject(2, Map.class);
assertEquals(2, entry.get("key"));
assertEquals(22, entry.get("value"));
assertTrue(resultSet.next());
entry = resultSet.getObject(1, Map.class);
entry = resultSet.getObject(2, Map.class);
assertEquals(3, entry.get("key"));
assertEquals(33, entry.get("value"));
assertFalse(resultSet.next());
Expand All @@ -173,7 +173,7 @@ public void testShouldGetArrayReturnValidArray() throws SQLException {
assertFalse(accessor.wasNull());
try (ResultSet resultSet = array.getResultSet()) {
assertTrue(resultSet.next());
Map<?, ?> entry = resultSet.getObject(1, Map.class);
Map<?, ?> entry = resultSet.getObject(2, Map.class);
assertEquals(2, entry.get("key"));
assertNull(entry.get("value"));
assertFalse(resultSet.next());
Expand All @@ -185,19 +185,19 @@ public void testShouldGetArrayReturnValidArray() throws SQLException {
assertFalse(accessor.wasNull());
try (ResultSet resultSet = array.getResultSet()) {
assertTrue(resultSet.next());
Map<?, ?> entry = resultSet.getObject(1, Map.class);
Map<?, ?> entry = resultSet.getObject(2, Map.class);
assertEquals(0, entry.get("key"));
assertEquals(2000, entry.get("value"));
assertTrue(resultSet.next());
entry = resultSet.getObject(1, Map.class);
entry = resultSet.getObject(2, Map.class);
assertEquals(1, entry.get("key"));
assertEquals(2001, entry.get("value"));
assertTrue(resultSet.next());
entry = resultSet.getObject(1, Map.class);
entry = resultSet.getObject(2, Map.class);
assertEquals(2, entry.get("key"));
assertEquals(2002, entry.get("value"));
assertTrue(resultSet.next());
entry = resultSet.getObject(1, Map.class);
entry = resultSet.getObject(2, Map.class);
assertEquals(3, entry.get("key"));
assertEquals(2003, entry.get("value"));
assertFalse(resultSet.next());
Expand Down
Loading