You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2024/09/07 00:25:25 UTC
(nifi) branch support/nifi-1.x updated: NIFI-13715 Fixed StandardProvenanceEventRecord.hashCode() to sort Parent/Child FlowFiles as equals() does (#9242)
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new e966d99057 NIFI-13715 Fixed StandardProvenanceEventRecord.hashCode() to sort Parent/Child FlowFiles as equals() does (#9242)
e966d99057 is described below
commit e966d99057ae34b4529c7418d58b6c865cf2e615
Author: Peter Turcsanyi <35...@users.noreply.github.com>
AuthorDate: Sat Sep 7 02:25:20 2024 +0200
NIFI-13715 Fixed StandardProvenanceEventRecord.hashCode() to sort Parent/Child FlowFiles as equals() does (#9242)
Signed-off-by: David Handermann <ex...@apache.org>
---
.../provenance/StandardProvenanceEventRecord.java | 8 ++-
.../StandardProvenanceEventRecordTest.java | 64 ++++++++++++++++++++++
2 files changed, 71 insertions(+), 1 deletion(-)
diff --git a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
index 84e7419a29..04c9e5b185 100644
--- a/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
+++ b/nifi-commons/nifi-data-provenance-utils/src/main/java/org/apache/nifi/provenance/StandardProvenanceEventRecord.java
@@ -302,9 +302,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
diff --git a/nifi-commons/nifi-data-provenance-utils/src/test/java/org/apache/nifi/provenance/StandardProvenanceEventRecordTest.java b/nifi-commons/nifi-data-provenance-utils/src/test/java/org/apache/nifi/provenance/StandardProvenanceEventRecordTest.java
new file mode 100644
index 0000000000..dcf14b2740
--- /dev/null
+++ b/nifi-commons/nifi-data-provenance-utils/src/test/java/org/apache/nifi/provenance/StandardProvenanceEventRecordTest.java
@@ -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.Arrays;
+
+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(Arrays.asList(FLOWFILE_ID_1, FLOWFILE_ID_2))
+ .build();
+ final ProvenanceEventRecord event2 = initProvenanceEvent()
+ .setChildUuids(Arrays.asList(FLOWFILE_ID_2, FLOWFILE_ID_1))
+ .build();
+
+ assertEquals(event1, event2);
+ assertEquals(event1.hashCode(), event2.hashCode());
+ }
+
+ @Test
+ void testEqualsAndHashCodeWithParentFlowFilesInDifferentOrder() {
+ final ProvenanceEventRecord event1 = initProvenanceEvent()
+ .setParentUuids(Arrays.asList(FLOWFILE_ID_1, FLOWFILE_ID_2))
+ .build();
+ final ProvenanceEventRecord event2 = initProvenanceEvent()
+ .setParentUuids(Arrays.asList(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);
+ }
+}