Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-9781: Fix handling when selecting array element via QueryRecord 

Signed-off-by: Joe Gresock <jgresock@gmail.com>

This closes #5853.
This commit is contained in:
Mark Payne 2022-03-09 11:04:00 -05:00 committed by Joe Gresock
parent 3219c105eb
commit 6a1c7c72d5
No known key found for this signature in database
GPG Key ID: 37F5B9B6E258C8B7
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/ResultSetRecordSet.java
View File

@ -18,6 +18,7 @@
package org.apache.nifi.serialization.record;
import org.apache.nifi.serialization.SimpleRecordSchema;
import org.apache.nifi.serialization.record.type.ArrayDataType;
import org.apache.nifi.serialization.record.util.DataTypeUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -201,7 +202,7 @@ public class ResultSetRecordSet implements RecordSet, Closeable {
throws SQLException {
switch (sqlType) {
case Types.ARRAY:
return getArrayDataType(rs, columnIndex, useLogicalTypes);
return getArrayDataType(rs, readerSchema, columnIndex, useLogicalTypes);
case Types.BINARY:
case Types.LONGVARBINARY:
case Types.VARBINARY:
@ -282,7 +283,21 @@ public class ResultSetRecordSet implements RecordSet, Closeable {
}
}
private DataType getArrayDataType(final ResultSet rs, final int columnIndex, final boolean useLogicalTypes) throws SQLException {
private DataType getArrayDataType(final ResultSet rs, final RecordSchema readerSchema, final int columnIndex, final boolean useLogicalTypes) throws SQLException {
// We first want to check if the Reader Schema can tell us what the type of the array is.
final String columnName = rs.getMetaData().getColumnName(columnIndex);
final Optional<RecordField> optionalRecordField = readerSchema.getField(columnName);
if (optionalRecordField.isPresent()) {
final RecordField recordField = optionalRecordField.get();
final DataType dataType = recordField.getDataType();
if (dataType.getFieldType() == RecordFieldType.ARRAY) {
final ArrayDataType arrayDataType = (ArrayDataType) dataType;
if (arrayDataType.getElementType() != null) {
return dataType;
}
}
}
// The JDBC API does not allow us to know what the base type of an array is through the metadata.
// As a result, we have to obtain the actual Array for this record. Once we have this, we can determine
// the base type. However, if the base type is, itself, an array, we will simply return a base type of

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/queryrecord/FlowFileEnumerator.java
View File

@ -107,7 +107,7 @@ public class FlowFileEnumerator implements Enumerator<Object> {
// the actual value, NOT a 1-element array of values.
if (fields.length == 1) {
final int desiredCellIndex = fields[0];
return row[desiredCellIndex];
return cast(row[desiredCellIndex]);
}
// Create a new Object array that contains only the desired fields.