kubaugust commented on code in PR #11817:
URL: https://github.com/apache/nifi/pull/11817#discussion_r4323901825
##########
nifi-commons/nifi-record/src/test/java/org/apache/nifi/serialization/record/TestDataTypeUtils.java:
##########
@@ -1688,4 +1690,88 @@ public void
testMergeSchemasSingleSideNestedArrayFieldBecomesNullable() {
assertTrue(merged.getField("tags").orElseThrow().isNullable());
assertFalse(((ArrayDataType)
merged.getField("tags").orElseThrow().getDataType()).isElementsNullable());
}
+
+ @Test
+ public void
testMergeDataTypesWithDeeplyNestedNonWiderRecordsCompletesQuickly() {
+ final DataType merged =
assertTimeoutPreemptively(Duration.ofSeconds(10),
+ () -> DataTypeUtils.mergeDataTypes(createNestedRecordType(40,
"a"), createNestedRecordType(40, "b")));
+
+ final RecordSchema mergedSchema = ((RecordDataType)
merged).getChildSchema();
+ assertEquals(List.of("content", "a", "b"),
mergedSchema.getFieldNames());
+ }
+
+ @Test
+ public void
testMergeDataTypesWithChoiceOfDeeplyNestedNonWiderRecordsCompletesQuickly() {
+ final DataType choice =
RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.STRING.getDataType(),
createNestedRecordType(40, "a"));
+ final DataType merged =
assertTimeoutPreemptively(Duration.ofSeconds(10),
+ () -> DataTypeUtils.mergeDataTypes(choice,
createNestedRecordType(40, "b")));
+
+ final List<DataType> subTypes = ((ChoiceDataType)
merged).getPossibleSubTypes();
+ assertEquals(2, subTypes.size());
+ assertEquals(RecordFieldType.STRING.getDataType(), subTypes.get(0));
+ final RecordSchema mergedSchema = ((RecordDataType)
subTypes.get(1)).getChildSchema();
+ assertEquals(List.of("content", "a", "b"),
mergedSchema.getFieldNames());
+ }
+
+ @Test
+ public void
testMergeDataTypesWithChoiceOfDeeplyNestedNonWiderRecordArraysCompletesQuickly()
{
+ final DataType choice =
RecordFieldType.CHOICE.getChoiceDataType(RecordFieldType.STRING.getDataType(),
+ RecordFieldType.ARRAY.getArrayDataType(createNestedRecordType(40,
"a")));
+ final DataType merged =
assertTimeoutPreemptively(Duration.ofSeconds(10),
+ () -> DataTypeUtils.mergeDataTypes(choice,
RecordFieldType.ARRAY.getArrayDataType(createNestedRecordType(40, "b"))));
+
+ assertEquals(List.of(RecordFieldType.STRING.getDataType(),
+
RecordFieldType.ARRAY.getArrayDataType(createNestedRecordType(40, "a")),
+
RecordFieldType.ARRAY.getArrayDataType(createNestedRecordType(40, "b"))),
+ ((ChoiceDataType) merged).getPossibleSubTypes());
+ }
+
+ @Test
+ public void
testMergeDataTypesWithNestedArraysOfDeeplyNestedNonWiderRecordsCompletesQuickly()
{
+ final DataType merged =
assertTimeoutPreemptively(Duration.ofSeconds(10), () ->
DataTypeUtils.mergeDataTypes(
+
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.ARRAY.getArrayDataType(createNestedRecordType(40,
"a"))),
+
RecordFieldType.ARRAY.getArrayDataType(RecordFieldType.ARRAY.getArrayDataType(createNestedRecordType(40,
"b")))));
+
+ assertEquals(RecordFieldType.CHOICE, merged.getFieldType());
+ }
+
+ @ParameterizedTest
+ @MethodSource("nestedArrayWiderRecordData")
+ public void testGetWiderTypeWithNestedArrayFields(final DataType
widerArrayType, final DataType narrowerArrayType, final boolean expectedWider) {
Review Comment:
Sure, removed
--
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.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
