Skip to content

Fix NPE on materialising nested arrays or arrays of maps with NULL elements. #1659

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
michael-simons wants to merge 1 commit into
base: main
Choose a base branch
from
+89 −0
Open

Fix NPE on materialising nested arrays or arrays of maps with NULL elements. #1659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions src/main/java/com/databricks/jdbc/api/impl/DatabricksArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ private Object[] convertElements(List<Object> elements, String elementType) {
convertedElements[i] = new DatabricksStruct((Map<String, Object>) element, elementType);
} else if (element instanceof DatabricksStruct) {
convertedElements[i] = element;
} else if (element == null) {
convertedElements[i] = null;
} else {
throw new DatabricksDriverException(
"Expected a Map for STRUCT but found: " + element.getClass().getSimpleName(),
Expand All @@ -64,6 +66,8 @@ private Object[] convertElements(List<Object> elements, String elementType) {
convertedElements[i] = new DatabricksArray((List<Object>) element, elementType);
} else if (element instanceof DatabricksArray) {
convertedElements[i] = element;
} else if (element == null) {
convertedElements[i] = null;
Comment thread
michael-simons marked this conversation as resolved.
} else {
throw new DatabricksDriverException(
"Expected a List for ARRAY but found: " + element.getClass().getSimpleName(),
Expand All @@ -74,6 +78,8 @@ private Object[] convertElements(List<Object> elements, String elementType) {
convertedElements[i] = new DatabricksMap<>((Map<String, Object>) element, elementType);
} else if (element instanceof DatabricksMap) {
convertedElements[i] = element;
} else if (element == null) {
convertedElements[i] = null;
} else {
throw new DatabricksDriverException(
"Expected a Map for MAP but found: " + element.getClass().getSimpleName(),
Expand Down
83 changes: 83 additions & 0 deletions src/test/java/com/databricks/jdbc/integration/e2e/ComplexTypeQueryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,89 @@ void testEmptyArray(int thriftVal, int complexSupport) throws SQLException {
}
}

@ParameterizedTest
@CsvSource({"0,0", "1,0", "0,1", "1,1"})
void testNestedArrayWithNullElement(int thriftVal, int complexSupport) throws SQLException {
Comment thread
michael-simons marked this conversation as resolved.
setupConnection(thriftVal, complexSupport);

String sql = "SELECT array(null, array('Hello'))::ARRAY<ARRAY<VARCHAR(32)>> AS arr";
ResultSet rs = executeQuery(connection, sql);
assertNotNull(rs);
while (rs.next()) {
if (complexSupport == 1) {
Array arr = rs.getArray("arr");
assertNotNull(arr);
Object[] elements = (Object[]) arr.getArray();
assertEquals(2, elements.length);
assertNull(elements[0]);
assertInstanceOf(Array.class, elements[1]);
Object[] innerElements = (Object[]) ((Array) elements[1]).getArray();
assertEquals(1, innerElements.length);
assertEquals("Hello", innerElements[0]);
} else {
assertThrows(SQLException.class, () -> rs.getArray("arr"));
Object obj = rs.getObject("arr");
assertInstanceOf(String.class, obj);
String text = (String) obj;
assertFalse(text.isEmpty());
}
}
}

@ParameterizedTest
@CsvSource({"0,0", "1,0", "0,1", "1,1"})
void testArrayOfMapsWithNullElement(int thriftVal, int complexSupport) throws SQLException {
setupConnection(thriftVal, complexSupport);

String sql =
"SELECT array(null, map('red', 1, 'green', 2))::ARRAY<MAP<VARCHAR(8), INT>> AS arr";
ResultSet rs = executeQuery(connection, sql);
assertNotNull(rs);
while (rs.next()) {
if (complexSupport == 1) {
Array arr = rs.getArray("arr");
assertNotNull(arr);
Object[] elements = (Object[]) arr.getArray();
assertEquals(2, elements.length);
assertNull(elements[0]);
assertInstanceOf(Map.class, elements[1]);
} else {
assertThrows(SQLException.class, () -> rs.getArray("arr"));
Object obj = rs.getObject("arr");
assertInstanceOf(String.class, obj);
String text = (String) obj;
assertFalse(text.isEmpty());
}
}
}

@ParameterizedTest
@CsvSource({"0,0", "1,0", "0,1", "1,1"})
void testArrayOfStructsWithNullElement(int thriftVal, int complexSupport) throws SQLException {
setupConnection(thriftVal, complexSupport);

String sql =
"SELECT array(null, struct('Spark', 5))::ARRAY<STRUCT<col1:string,col2:int>> AS arr";
ResultSet rs = executeQuery(connection, sql);
assertNotNull(rs);
while (rs.next()) {
if (complexSupport == 1) {
Array arr = rs.getArray("arr");
assertNotNull(arr);
Object[] elements = (Object[]) arr.getArray();
assertEquals(2, elements.length);
assertNull(elements[0]);
assertInstanceOf(Struct.class, elements[1]);
} else {
assertThrows(SQLException.class, () -> rs.getArray("arr"));
Object obj = rs.getObject("arr");
assertInstanceOf(String.class, obj);
String text = (String) obj;
assertFalse(text.isEmpty());
}
}
}

@ParameterizedTest
@CsvSource({"0,0", "1,0", "0,1", "1,1"})
void testNullArray(int thriftVal, int complexSupport) throws SQLException {
Expand Down
Loading