thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 05:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: Fixed issues with INSERT. [#METR-19266]

Browse Source
This commit is contained in:
Alexey Arno 2016-08-24 19:52:17 +03:00
parent 6a036bad4f
commit d4e5cd2004
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dbms/src/DataTypes/DataTypeNullable.cpp
View File

@ -17,11 +17,13 @@ namespace
/// we use for the binary deserialization. They are used as follows: /// we use for the binary deserialization. They are used as follows:
/// ///
/// auto action = NullDeserializer<NullSymbol::XXX>::execute(col, istr); /// auto action = NullDeserializer<NullSymbol::XXX>::execute(col, istr);
/// if (action != Action::NONE) ///
/// { /// if (action == Action::NONE) /// eof
/// return;
/// else if (action == Action::ADD_ORDINARY) /// add an ordinary value
/// ... deserialize the nested column ... /// ... deserialize the nested column ...
/// updateNullMap(col, action); ///
/// } /// updateNullMap(col, action);
/// ///
/// This two-step process is required because when we perform an INSERT query /// This two-step process is required because when we perform an INSERT query
/// whose values are expressions, ValuesRowInputStream attempts to deserialize /// whose values are expressions, ValuesRowInputStream attempts to deserialize
@ -135,11 +137,13 @@ void DataTypeNullable::deserializeTextEscaped(IColumn & column, ReadBuffer & ist
ColumnNullable & col = static_cast<ColumnNullable &>(column); ColumnNullable & col = static_cast<ColumnNullable &>(column);
auto action = NullDeserializer<NullSymbol::Escaped>::execute(col, istr); auto action = NullDeserializer<NullSymbol::Escaped>::execute(col, istr);
if (action != Action::NONE)
{ if (action == Action::NONE)
return;
else if (action == Action::ADD_ORDINARY)
nested_data_type->deserializeTextEscaped(*col.getNestedColumn(), istr); nested_data_type->deserializeTextEscaped(*col.getNestedColumn(), istr);
updateNullMap(col, action);
} updateNullMap(col, action);
} }
void DataTypeNullable::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr) const void DataTypeNullable::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
@ -157,11 +161,14 @@ void DataTypeNullable::deserializeTextQuoted(IColumn & column, ReadBuffer & istr
ColumnNullable & col = static_cast<ColumnNullable &>(column); ColumnNullable & col = static_cast<ColumnNullable &>(column);
auto action = NullDeserializer<NullSymbol::Quoted>::execute(col, istr); auto action = NullDeserializer<NullSymbol::Quoted>::execute(col, istr);
if (action != Action::NONE)
{ if (action == Action::NONE)
return;
else if (action == Action::ADD_ORDINARY)
nested_data_type->deserializeTextQuoted(*col.getNestedColumn(), istr); nested_data_type->deserializeTextQuoted(*col.getNestedColumn(), istr);
updateNullMap(col, action);
} updateNullMap(col, action);
} }
void DataTypeNullable::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr) const void DataTypeNullable::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
@ -179,11 +186,13 @@ void DataTypeNullable::deserializeTextCSV(IColumn & column, ReadBuffer & istr, c
ColumnNullable & col = static_cast<ColumnNullable &>(column); ColumnNullable & col = static_cast<ColumnNullable &>(column);
auto action = NullDeserializer<NullSymbol::Quoted>::execute(col, istr); auto action = NullDeserializer<NullSymbol::Quoted>::execute(col, istr);
if (action != Action::NONE)
{ if (action == Action::NONE)
return;
else if (action == Action::ADD_ORDINARY)
nested_data_type->deserializeTextCSV(*col.getNestedColumn(), istr, delimiter); nested_data_type->deserializeTextCSV(*col.getNestedColumn(), istr, delimiter);
updateNullMap(col, action);
} updateNullMap(col, action);
} }
void DataTypeNullable::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr) const void DataTypeNullable::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr) const
@ -211,11 +220,13 @@ void DataTypeNullable::deserializeTextJSON(IColumn & column, ReadBuffer & istr)
ColumnNullable & col = static_cast<ColumnNullable &>(column); ColumnNullable & col = static_cast<ColumnNullable &>(column);
auto action = NullDeserializer<NullSymbol::JSON>::execute(col, istr); auto action = NullDeserializer<NullSymbol::JSON>::execute(col, istr);
if (action != Action::NONE)
{ if (action == Action::NONE)
return;
else if (action == Action::ADD_ORDINARY)
nested_data_type->deserializeTextJSON(*col.getNestedColumn(), istr); nested_data_type->deserializeTextJSON(*col.getNestedColumn(), istr);
updateNullMap(col, action);
} updateNullMap(col, action);
} }
void DataTypeNullable::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr) const void DataTypeNullable::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr) const