Skip to content

NIFI-6853 - flowFileEvent combineCounters hashmap overwritten #3875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ivan1221 wants to merge 2 commits into from
Closed

NIFI-6853 - flowFileEvent combineCounters hashmap overwritten #3875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f60e11
NIFI-6853 - flowFileEvent combineCounters hashmap overwritten
ivan1221 Nov 7, 2019
b75e61e
Added unit test to verify behavior of contribution
Nov 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...work-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ private Map<String, Long> combineCounters(final Map<String, Long> first, final M

final Map<String, Long> combined = new HashMap<>();
combined.putAll(first);
combined.putAll(second);
second.forEach((key, value) -> combined.merge(key, value, Long::sum));
return combined;
}

Expand Down Expand Up @@ -3391,12 +3391,16 @@ private void checkpoint(final StandardProcessSession session, final List<Provena
if (this.countersOnCommit.isEmpty()) {
this.countersOnCommit.putAll(session.countersOnCommit);
} else {
session.countersOnCommit.forEach((key, value) -> this.countersOnCommit.merge(key, value, (v1, v2) -> v1 + v2));
session.countersOnCommit.forEach((key, value) -> this.countersOnCommit.merge(key, value, Long::sum));
}
}

if (session.immediateCounters != null) {
this.immediateCounters.putAll(session.immediateCounters);
if (this.immediateCounters.isEmpty()) {
this.immediateCounters.putAll(session.immediateCounters);
} else {
session.immediateCounters.forEach((key, value) -> this.immediateCounters.merge(key, value, Long::sum));
}
}

this.deleteOnCommit.putAll(session.deleteOnCommit);
Expand Down
31 changes: 31 additions & 0 deletions ...-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,37 @@ public void testCheckpointMergesCounters() {
assertEquals(2, bCounters);
}

@Test
public void testCombineCounters() {
final Relationship relationship = new Relationship.Builder().name("A").build();

FlowFile flowFile = session.create();
session.transfer(flowFile, relationship);
session.adjustCounter("a", 1, false);
session.adjustCounter("b", 3, false);
session.adjustCounter("a", 3, true);
session.adjustCounter("b", 5, true);
session.checkpoint();

flowFile = session.create();
session.transfer(flowFile, relationship);
session.adjustCounter("a", 1, true);
session.adjustCounter("b", 2, true);
session.commit();

context.getFlowFileEventRepository().reportTransferEvents(10L).getReportEntries().forEach((k, v) -> {
v.getCounters().forEach((key, value) -> {
if (key.equals("a")) {
assertEquals(5L, (long) value);
}

if (key.equals("b")) {
assertEquals(10L, (long) value);
}
});
});
}

@Test
public void testReadCountCorrectWhenSkippingWithReadCallback() throws IOException {
final byte[] content = "This and that and the other.".getBytes(StandardCharsets.UTF_8);
Expand Down