Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-5150: Fixed bug that caused StandardProcessSession.append() to copy too much data when called on an incoming flowfile 

This closes #2676.

Signed-off-by: Bryan Bende <bbende@apache.org>
This commit is contained in:
Mark Payne 2018-05-04 12:03:14 -04:00 committed by Bryan Bende
parent 5cfa29e48f
commit 868808f4b4
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/StandardProcessSession.java
View File

@ -2677,7 +2677,7 @@ public final class StandardProcessSession implements ProcessSession, ProvenanceE
if (outStream == null) { if (outStream == null) {
claimCache.flush(oldClaim); claimCache.flush(oldClaim);
try (final InputStream oldClaimIn = context.getContentRepository().read(oldClaim)) { try (final InputStream oldClaimIn = read(source)) {
newClaim = context.getContentRepository().create(context.getConnectable().isLossTolerant()); newClaim = context.getContentRepository().create(context.getConnectable().isLossTolerant());
claimLog.debug("Creating ContentClaim {} for 'append' for {}", newClaim, source); claimLog.debug("Creating ContentClaim {} for 'append' for {}", newClaim, source);

32
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/test/java/org/apache/nifi/controller/repository/TestStandardProcessSession.java
View File

@ -38,6 +38,7 @@ import java.io.FilterOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
@ -73,6 +74,7 @@ import org.apache.nifi.flowfile.attributes.CoreAttributes;
import org.apache.nifi.groups.ProcessGroup; import org.apache.nifi.groups.ProcessGroup;
import org.apache.nifi.processor.FlowFileFilter; import org.apache.nifi.processor.FlowFileFilter;
import org.apache.nifi.processor.FlowFileFilter.FlowFileFilterResult; import org.apache.nifi.processor.FlowFileFilter.FlowFileFilterResult;
import org.apache.nifi.processor.ProcessSession;
import org.apache.nifi.processor.Relationship; import org.apache.nifi.processor.Relationship;
import org.apache.nifi.processor.exception.FlowFileAccessException; import org.apache.nifi.processor.exception.FlowFileAccessException;
import org.apache.nifi.processor.exception.MissingFlowFileException; import org.apache.nifi.processor.exception.MissingFlowFileException;
@ -1176,6 +1178,36 @@ public class TestStandardProcessSession {
assertEquals("Hello, World", new String(buff)); assertEquals("Hello, World", new String(buff));
} }
@Test
public void testAppendToFlowFileWhereResourceClaimHasMultipleContentClaims() throws IOException {
final Relationship relationship = new Relationship.Builder().name("A").build();
FlowFile ffa = session.create();
ffa = session.write(ffa, (out) -> out.write('A'));
session.transfer(ffa, relationship);
FlowFile ffb = session.create();
ffb = session.write(ffb, (out) -> out.write('B'));
session.transfer(ffb, relationship);
session.commit();
final ProcessSession newSession = new StandardProcessSession(context, () -> false);
FlowFile toUpdate = newSession.get();
newSession.append(toUpdate, out -> out.write('C'));
// Read the content back and ensure that it is correct
final byte[] buff;
try (final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
newSession.read(toUpdate, in -> StreamUtils.copy(in, baos));
buff = baos.toByteArray();
}
final String output = new String(buff, StandardCharsets.UTF_8);
assertEquals("AC", output);
newSession.transfer(toUpdate);
newSession.commit();
}
@Test @Test
public void testAppendDoesNotDecrementContentClaimIfNotNeeded() { public void testAppendDoesNotDecrementContentClaimIfNotNeeded() {
FlowFile flowFile = session.create(); FlowFile flowFile = session.create();