thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 00:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: CSV format: development [#METR-19957].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-02-07 14:49:49 +03:00
parent dadadf1b37
commit d72720616a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dbms/src/DataStreams/CSVRowInputStream.cpp
View File

@ -24,7 +24,7 @@ CSVRowInputStream::CSVRowInputStream(ReadBuffer & istr_, const Block & sample_,
}
static void skipLineFeed(ReadBuffer & istr)
static void skipEndOfLine(ReadBuffer & istr)
{
/// \n (Unix) или \r\n (DOS/Windows) или \n\r (Mac OS Classic)
@ -43,6 +43,8 @@ static void skipLineFeed(ReadBuffer & istr)
throw Exception("Cannot parse CSV format: found \\r (CR) not followed by \\n (LF)."
" Line must end by \\n (LF) or \\r\\n (CR LF) or \\n\\r.", ErrorCodes::INCORRECT_DATA);
}
else if (!istr.eof())
throw Exception("Expected end of line", ErrorCodes::INCORRECT_DATA);
}
@ -61,7 +63,7 @@ static void skipDelimiter(ReadBuffer & istr, const char delimiter, bool is_last_
return;
}
skipLineFeed(istr);
skipEndOfLine(istr);
}
else
assertChar(delimiter, istr);
@ -73,7 +75,7 @@ static inline void skipWhitespacesAndTabs(ReadBuffer & buf)
{
while (!buf.eof()
&& (*buf.position() == ' '
|| *buf.position() == '\t'))
|| *buf.position() == '\t'))
++buf.position();
}
@ -87,7 +89,7 @@ static void skipRow(ReadBuffer & istr, const char delimiter, size_t columns)
readCSVString(tmp, istr);
skipWhitespacesAndTabs(istr);
skipDelimiter(istr, i + 1 == columns, delimiter);
skipDelimiter(istr, delimiter, i + 1 == columns);
}
}
@ -126,7 +128,7 @@ bool CSVRowInputStream::read(Row & row)
data_types[i]->deserializeTextCSV(row[i], istr, delimiter);
skipWhitespacesAndTabs(istr);
skipDelimiter(istr, i + 1 == size, delimiter);
skipDelimiter(istr, delimiter, i + 1 == size);
}
}
catch (Exception & e)
@ -372,7 +374,7 @@ bool CSVRowInputStream::parseRowAndPrintDiagnosticInfo(
return false;
}
skipLineFeed(istr);
skipEndOfLine(istr);
}
else
{

2
dbms/src/IO/ReadHelpers.cpp
View File

@ -305,7 +305,7 @@ void readCSVString(String & s, ReadBuffer & buf, const char delimiter)
if (maybe_quote == delimiter)
return;
if (maybe_quote == '\'' || maybe_quote == '\"')
if (maybe_quote == '\'' || maybe_quote == '"')
{
++buf.position();