You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: NEWS.md
+2Lines changed: 2 additions & 0 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -536,6 +536,8 @@ rowwiseDT(
536
536
537
537
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.
538
538
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
+
539
541
### NOTES
540
542
541
543
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).
Copy file name to clipboardExpand all lines: src/fread.c
+27-4Lines changed: 27 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -1628,12 +1628,35 @@ int freadMain(freadMainArgs _args)
1628
1628
if (verbose) DTPRINT(_("[04] Arrange mmap to be \\0 terminated\n"));
1629
1629
1630
1630
// 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
+
intcount_r_only=0; // \r not followed by \n
1633
+
intcount_with_n=0; // \n with or without \r
1631
1634
ch=sof;
1632
-
while (ch<eof&&*ch!='\n') ch++;
1633
-
eol_one_r= (ch==eof);
1635
+
constchar*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
+
} elseif (*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);
1634
1656
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"),
0 commit comments