thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-10-09 18:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added CSV (de)serialization

Browse Source
This commit is contained in:
Alexander Tokmakov 2019-04-17 23:15:57 +03:00 committed by Alexander Tokmakov
parent c92a0f3ac5
commit ab9ce18fc7
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/src/Formats/TemplateBlockOutputStream.cpp
View File

@ -94,6 +94,8 @@ ParsedTemplateFormat::ColumnFormat ParsedTemplateFormat::stringToFormat(const St
return ColumnFormat::Escaped; return ColumnFormat::Escaped;
else if (col_format == "Quoted") else if (col_format == "Quoted")
return ColumnFormat::Quoted; return ColumnFormat::Quoted;
else if (col_format == "CSV")
return ColumnFormat::Csv;
else if (col_format == "JSON") else if (col_format == "JSON")
return ColumnFormat::Json; return ColumnFormat::Json;
else if (col_format == "XML") else if (col_format == "XML")
@ -119,6 +121,8 @@ String ParsedTemplateFormat::formatToString(ParsedTemplateFormat::ColumnFormat f
return "Escaped"; return "Escaped";
case ColumnFormat::Quoted: case ColumnFormat::Quoted:
return "Quoted"; return "Quoted";
case ColumnFormat::Csv:
return "CSV";
case ColumnFormat::Json: case ColumnFormat::Json:
return "Json"; return "Json";
case ColumnFormat::Xml: case ColumnFormat::Xml:
@ -226,6 +230,9 @@ void TemplateBlockOutputStream::serializeField(const IColumn & column, const IDa
case ColumnFormat::Quoted: case ColumnFormat::Quoted:
type.serializeAsTextQuoted(column, row_num, ostr, settings); type.serializeAsTextQuoted(column, row_num, ostr, settings);
break; break;
case ColumnFormat::Csv:
type.serializeAsTextCSV(column, row_num, ostr, settings);
break;
case ColumnFormat::Json: case ColumnFormat::Json:
type.serializeAsTextJSON(column, row_num, ostr, settings); type.serializeAsTextJSON(column, row_num, ostr, settings);
break; break;

1
dbms/src/Formats/TemplateBlockOutputStream.h
View File

@ -17,6 +17,7 @@ struct ParsedTemplateFormat
Default, Default,
Escaped, Escaped,
Quoted, Quoted,
Csv,
Json, Json,
Xml, Xml,
Raw Raw

3
dbms/src/Formats/TemplateRowInputStream.cpp
View File

@ -101,6 +101,9 @@ void TemplateRowInputStream::deserializeField(const IDataType & type, IColumn &
case ColumnFormat::Quoted: case ColumnFormat::Quoted:
type.deserializeAsTextQuoted(column, buf, settings); type.deserializeAsTextQuoted(column, buf, settings);
break; break;
case ColumnFormat::Csv:
type.deserializeAsTextCSV(column, buf, settings);
break;
case ColumnFormat::Json: case ColumnFormat::Json:
type.deserializeAsTextJSON(column, buf, settings); type.deserializeAsTextJSON(column, buf, settings);
break; break;