NIFI-13715 Fixed StandardProvenanceEventRecord.hashCode() to sort Parent/Child FlowFiles as equals() does

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #9233.
This commit is contained in:
Peter Turcsanyi 2024-09-05 16:33:02 +02:00 committed by Pierre Villard
parent 448d84dff0
commit 85ca96cc90
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
2 changed files with 71 additions and 1 deletions

View File

@ -303,9 +303,15 @@ public class StandardProvenanceEventRecord implements ProvenanceEventRecord {
eventTypeCode = 4812 + eventType.hashCode() + 4 * uuid.hashCode();
}
final List<String> sortedChildUuids = new ArrayList<>(getChildUuids());
final List<String> sortedParentUuids = new ArrayList<>(getParentUuids());
Collections.sort(sortedChildUuids);
Collections.sort(sortedParentUuids);
return -37423 + 3 * componentId.hashCode() + (transitUri == null ? 0 : 41 * transitUri.hashCode())
+ (relationship == null ? 0 : 47 * relationship.hashCode()) + 44 * eventTypeCode
+ 47 * getChildUuids().hashCode() + 47 * getParentUuids().hashCode();
+ 47 * sortedChildUuids.hashCode() + 47 * sortedParentUuids.hashCode();
}
@Override

View File

@ -0,0 +1,64 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.nifi.provenance;
import org.junit.jupiter.api.Test;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertEquals;
class StandardProvenanceEventRecordTest {
private static final String FLOWFILE_ID_1 = "FF-1";
private static final String FLOWFILE_ID_2 = "FF-2";
@Test
void testEqualsAndHashCodeWithChildFlowFilesInDifferentOrder() {
final ProvenanceEventRecord event1 = initProvenanceEvent()
.setChildUuids(List.of(FLOWFILE_ID_1, FLOWFILE_ID_2))
.build();
final ProvenanceEventRecord event2 = initProvenanceEvent()
.setChildUuids(List.of(FLOWFILE_ID_2, FLOWFILE_ID_1))
.build();
assertEquals(event1, event2);
assertEquals(event1.hashCode(), event2.hashCode());
}
@Test
void testEqualsAndHashCodeWithParentFlowFilesInDifferentOrder() {
final ProvenanceEventRecord event1 = initProvenanceEvent()
.setParentUuids(List.of(FLOWFILE_ID_1, FLOWFILE_ID_2))
.build();
final ProvenanceEventRecord event2 = initProvenanceEvent()
.setParentUuids(List.of(FLOWFILE_ID_2, FLOWFILE_ID_1))
.build();
assertEquals(event1, event2);
assertEquals(event1.hashCode(), event2.hashCode());
}
private StandardProvenanceEventRecord.Builder initProvenanceEvent() {
return new StandardProvenanceEventRecord.Builder()
.setEventType(ProvenanceEventType.FORK)
.setComponentId("0")
.setComponentType("processor")
.setFlowFileUUID("FF")
.setCurrentContentClaim("container", "section", "identifier", 0L, 0);
}
}