tpalfy commented on a change in pull request #4223:
URL: https://github.com/apache/nifi/pull/4223#discussion_r432585859
##########
File path:
nifi-commons/nifi-record/src/main/java/org/apache/nifi/serialization/record/util/DataTypeUtils.java
##########
@@ -1691,15 +1765,37 @@ public static DataType mergeDataTypes(final DataType
thisDataType, final DataTyp
case FLOAT:
if (otherFieldType == RecordFieldType.DOUBLE) {
return Optional.of(otherDataType);
+ } else if (otherFieldType == RecordFieldType.DECIMAL) {
+ return Optional.of(otherDataType);
}
break;
case DOUBLE:
if (otherFieldType == RecordFieldType.FLOAT) {
return Optional.of(thisDataType);
+ } else if (otherFieldType == RecordFieldType.DECIMAL) {
+ return Optional.of(otherDataType);
}
break;
+ case DECIMAL:
+ if (otherFieldType == RecordFieldType.DOUBLE) {
+ return Optional.of(thisDataType);
+ } else if (otherFieldType == RecordFieldType.FLOAT) {
+ return Optional.of(thisDataType);
+ } else if (otherFieldType == RecordFieldType.DECIMAL) {
+ final DecimalDataType thisDecimalDataType =
(DecimalDataType) thisDataType;
+ final DecimalDataType otherDecimalDataType =
(DecimalDataType) otherDataType;
+
+ final int precision = thisDecimalDataType.getPrecision() >
otherDecimalDataType.getPrecision()
Review comment:
Minor: `Math.max` would be nicer imo.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
