Skip to content

Commit 738779b

Browse files
ben-schwenaitap
andauthored
fread failed to detect correct line endings with mixed \r and \r\n (#7384)
* add sampling of line endings * add coverage * skip consecutive \r * rephrase with Ivans suggestion Co-authored-by: aitap <[email protected]> * update test after rephrasing --------- Co-authored-by: aitap <[email protected]>
1 parent c26450a commit 738779b

File tree

3 files changed

+31
-4
lines changed

3 files changed

+31
-4
lines changed

NEWS.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,8 @@ rowwiseDT(
536536
537537
21. `setDT(get0('var'))` now correctly modifies `var` by reference, consistent with the long-standing behavior of `setDT(get('var'))`, [#6864](https://github.com/Rdatatable/data.table/issues/6864). Thanks to @rikivillalba for the report and @venom1204 for the fix.
538538
539+
22. `fread()` could fail to read Mac CSV files (with `\r` line endings) if the file contained any `\n` character, such as a final `\r\n`. This was fixed by detecting the predominant line ending in a sample of the file, [#4186](https://github.com/Rdatatable/data.table/issues/4186). Thanks to @MPagel for the report and @ben-schwen for the fix.
540+
539541
### NOTES
540542
541543
1. There is a new vignette on joins! See `vignette("datatable-joins")`. Thanks to Angel Feliz for authoring it! Feedback welcome. This vignette has been highly requested since 2017: [#2181](https://github.com/Rdatatable/data.table/issues/2181).

inst/tests/tests.Rraw

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11952,6 +11952,8 @@ tt = setDT(read.csv(f, stringsAsFactors=FALSE))
1195211952
tt[2, B:=gsub("\n","\r",B)] # base R changes the \r to a \n, so restore that
1195311953
test(1778.4, tt, DT)
1195411954
unlink(f)
11955+
# fread has problems with mixed \r and \r\n #4186
11956+
test(1778.5, fread(text="Col1;Col2\r1;data1\r2;data2\r3;data3\r\n", verbose=TRUE), data.table(Col1=1:3, Col2=c("data1","data2","data3")), output="An \\r")
1195511957

1195611958
# #1392 IDate ITime new methods for faster conversion
1195711959
# conversion in-out match for UTC

src/fread.c

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,12 +1628,35 @@ int freadMain(freadMainArgs _args)
16281628
if (verbose) DTPRINT(_("[04] Arrange mmap to be \\0 terminated\n"));
16291629

16301630
// First, set 'eol_one_r' for use by eol() to know if \r-only line ending is allowed, #2371
1631+
// Count different line ending types to handle mixed endings (e.g. Mac CSV with mostly \r and final \r\n) #4186
1632+
int count_r_only = 0; // \r not followed by \n
1633+
int count_with_n = 0; // \n with or without \r
16311634
ch = sof;
1632-
while (ch < eof && *ch != '\n') ch++;
1633-
eol_one_r = (ch == eof);
1635+
const char *sample_end = eof;
1636+
if ((size_t)(eof - sof) > 100000) sample_end = sof + 100000; // Sample first 100KB or whole file if smaller
1637+
while (ch < sample_end) {
1638+
if (*ch == '\r') {
1639+
// Skip consecutive \r to avoid miscounting \r\r\n as multiple line endings
1640+
while (ch < sample_end && *ch == '\r') ch++;
1641+
if (ch < sample_end && *ch == '\n') {
1642+
count_with_n++;
1643+
ch++;
1644+
} else {
1645+
count_r_only++;
1646+
}
1647+
} else if (*ch == '\n') {
1648+
count_with_n++;
1649+
ch++;
1650+
} else {
1651+
ch++;
1652+
}
1653+
}
1654+
// If file has mostly \r-only line endings, treat \r as line ending
1655+
eol_one_r = (count_r_only > count_with_n);
16341656
if (verbose) DTPRINT(eol_one_r ?
1635-
_(" No \\n exists in the file at all, so single \\r (if any) will be taken as one line ending. This is unusual but will happen normally when there is no \\r either; e.g. a single line missing its end of line.\n") :
1636-
_(" \\n has been found in the input and different lines can end with different line endings (e.g. mixed \\n and \\r\\n in one file). This is common and ideal.\n"));
1657+
_(" An \\r by itself will be taken as one line ending (counts: %d \\r by themselves vs %d [\\r]*\\n). This happens with old Mac CSV or when there is no \\r at all.\n") :
1658+
_(" \\n has been found in the input (counts: %d \\r by themselves vs %d [\\r]*\\n) and different lines can end with different line endings (e.g. mixed \\n and \\r\\n in one file). This is common and ideal.\n"),
1659+
count_r_only, count_with_n);
16371660

16381661
bool lastEOLreplaced = false;
16391662
if (args.filename) {

0 commit comments

Comments
 (0)