yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-09-26 17:45:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(timeline): fixes a renaming corner case (#11843)

Browse Source
This commit is contained in:
RyanHolstien 2024-11-12 17:42:57 -06:00 committed by GitHub
parent 9f5bf31009
commit 3f5fc9a540
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
metadata-io/src/main/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGenerator.java
View File

@ -266,6 +266,7 @@ public class SchemaMetadataChangeEventGenerator extends EntityChangeEventGenerat
SchemaField renamedField = SchemaField renamedField =
findRenamedField( findRenamedField(
curBaseField, curBaseField,
new HashSet<>(baseFields.subList(baseFieldIdx, baseFields.size())),
targetFields.subList(targetFieldIdx, targetFields.size()), targetFields.subList(targetFieldIdx, targetFields.size()),
renamedFields); renamedFields);
if (renamedField == null) { if (renamedField == null) {
@ -289,7 +290,10 @@ public class SchemaMetadataChangeEventGenerator extends EntityChangeEventGenerat
// minor version bump for both. // minor version bump for both.
SchemaField renamedField = SchemaField renamedField =
findRenamedField( findRenamedField(
curTargetField, baseFields.subList(baseFieldIdx, baseFields.size()), renamedFields); curTargetField,
new HashSet<>(targetFields.subList(targetFieldIdx, targetFields.size())),
baseFields.subList(baseFieldIdx, baseFields.size()),
renamedFields);
if (renamedField == null) { if (renamedField == null) {
processAdd(changeCategories, changeEvents, datasetUrn, curTargetField, auditStamp); processAdd(changeCategories, changeEvents, datasetUrn, curTargetField, auditStamp);
++targetFieldIdx; ++targetFieldIdx;
@ -348,10 +352,14 @@ public class SchemaMetadataChangeEventGenerator extends EntityChangeEventGenerat
} }
private static SchemaField findRenamedField( private static SchemaField findRenamedField(
SchemaField curField, List<SchemaField> targetFields, Set<SchemaField> renamedFields) { SchemaField curField,
Set<SchemaField> baseFields,
List<SchemaField> targetFields,
Set<SchemaField> renamedFields) {
return targetFields.stream() return targetFields.stream()
.filter(schemaField -> isRenamed(curField, schemaField)) .filter(schemaField -> isRenamed(curField, schemaField))
.filter(field -> !renamedFields.contains(field)) .filter(field -> !renamedFields.contains(field))
.filter(field -> !baseFields.contains(field)) // Filter out fields that will match later
.findFirst() .findFirst()
.orElse(null); .orElse(null);
} }

31
metadata-io/src/test/java/com/linkedin/metadata/timeline/eventgenerator/SchemaMetadataChangeEventGeneratorTest.java
View File

@ -153,6 +153,37 @@ public class SchemaMetadataChangeEventGeneratorTest extends AbstractTestNGSpring
Set.of(SchemaFieldModificationCategory.RENAME.toString()), actual); Set.of(SchemaFieldModificationCategory.RENAME.toString()), actual);
} }
@Test
public void testSchemaFieldRename2() throws Exception {
SchemaMetadataChangeEventGenerator test = new SchemaMetadataChangeEventGenerator();
Urn urn = getTestUrn();
String entity = "dataset";
String aspect = "schemaMetadata";
AuditStamp auditStamp = getTestAuditStamp();
Aspect<SchemaMetadata> from =
getSchemaMetadata(
List.of(
new SchemaField().setFieldPath("id").setNativeDataType("VARCHAR"),
new SchemaField().setFieldPath("fullname").setNativeDataType("VARCHAR"),
new SchemaField().setFieldPath("LastName").setNativeDataType("VARCHAR")));
Aspect<SchemaMetadata> to =
getSchemaMetadata(
List.of(
new SchemaField().setFieldPath("id").setNativeDataType("VARCHAR"),
new SchemaField().setFieldPath("fullname").setNativeDataType("VARCHAR"),
new SchemaField().setFieldPath("lastName").setNativeDataType("VARCHAR")));
List<ChangeEvent> actual = test.getChangeEvents(urn, entity, aspect, from, to, auditStamp);
compareDescriptions(
Set.of(
"A forwards & backwards compatible change due to renaming of the field 'LastName to lastName'."),
actual);
assertEquals(1, actual.size());
compareModificationCategories(
Set.of(SchemaFieldModificationCategory.RENAME.toString()), actual);
}
@Test @Test
public void testSchemaFieldDropAdd() throws Exception { public void testSchemaFieldDropAdd() throws Exception {
// When a rename cannot be detected, treated as drop -> add // When a rename cannot be detected, treated as drop -> add