Skip to content

NIFI-12238 Fix SplitText endline trimming with max fragment size #7892

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

Merged
markap14 merged 1 commit into from
Oct 18, 2023
Merged

NIFI-12238 Fix SplitText endline trimming with max fragment size #7892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions ...nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/SplitText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,6 @@ private SplitInfo nextSplit(TextLineDemarcator demarcator, long startOffset, lon
while ((offsetInfo = demarcator.nextOffsetInfo()) != null) {
lastCrlfLength = offsetInfo.getCrlfLength();

if (offsetInfo.getLength() == offsetInfo.getCrlfLength()) {
trailingCrlfLength += offsetInfo.getCrlfLength();
trailingLineCount++;
} else if (offsetInfo.getLength() > offsetInfo.getCrlfLength()) {
trailingCrlfLength = 0; // non-empty line came in, thus resetting counter
}

if (length + offsetInfo.getLength() + startingLength > this.maxSplitSize) {
if (length == 0) { // single line per split
length += offsetInfo.getLength();
Expand All @@ -474,12 +467,19 @@ private SplitInfo nextSplit(TextLineDemarcator demarcator, long startOffset, lon
remaningOffsetInfo = offsetInfo;
}
break;
} else {
length += offsetInfo.getLength();
actualLineCount++;
if (splitMaxLineCount > 0 && actualLineCount >= splitMaxLineCount) {
break;
}
}

if (offsetInfo.getLength() == offsetInfo.getCrlfLength()) {
trailingCrlfLength += offsetInfo.getCrlfLength();
trailingLineCount++;
} else if (offsetInfo.getLength() > offsetInfo.getCrlfLength()) {
trailingCrlfLength = 0; // non-empty line came in, thus resetting counter
}

length += offsetInfo.getLength();
actualLineCount++;
if (splitMaxLineCount > 0 && actualLineCount >= splitMaxLineCount) {
break;
}
}

Expand Down
21 changes: 21 additions & 0 deletions ...-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestSplitText.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,4 +890,25 @@ public void testWithEmptyHeaderLines() {
splits.get(1).assertContentEquals("\n");
}

@Test
public void testMaxFragmentSizeWithTrimmedEndlines() {
final TestRunner splitRunner = TestRunners.newTestRunner(new SplitText());
splitRunner.setProperty(SplitText.HEADER_LINE_COUNT, "2");
splitRunner.setProperty(SplitText.LINE_SPLIT_COUNT, "0");
splitRunner.setProperty(SplitText.FRAGMENT_MAX_SIZE, "30 B");
splitRunner.setProperty(SplitText.REMOVE_TRAILING_NEWLINES, "true");

splitRunner.enqueue("header1\nheader2\nline1 longer than limit\nline2\nline3\n\n\n\n\n");

splitRunner.run();
splitRunner.assertTransferCount(SplitText.REL_SPLITS, 3);
splitRunner.assertTransferCount(SplitText.REL_ORIGINAL, 1);
splitRunner.assertTransferCount(SplitText.REL_FAILURE, 0);

final List<MockFlowFile> splits = splitRunner.getFlowFilesForRelationship(SplitText.REL_SPLITS);
splits.get(0).assertContentEquals("header1\nheader2\nline1 longer than limit");
splits.get(1).assertContentEquals("header1\nheader2\nline2\nline3");
splits.get(2).assertContentEquals("header1\nheader2");
}

}