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

fix serialization info

Browse Source
This commit is contained in:
Anton Popov 2021-10-30 01:09:50 +03:00
parent 0099dfd523
commit 0a010e7d38
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/DataTypes/Serializations/ISerialization.cpp
View File

@ -34,6 +34,7 @@ String ISerialization::kindToString(Kind kind)
case Kind::SPARSE:
return "Sparse";
}
__builtin_unreachable();
}
ISerialization::Kind ISerialization::stringToKind(const String & str)

13
src/DataTypes/Serializations/SerializationInfo.cpp
View File

@ -92,7 +92,7 @@ void SerializationInfo::deserializeFromKindsBinary(ReadBuffer & in)
readBinary(kind_num, in);
auto maybe_kind = magic_enum::enum_cast<ISerialization::Kind>(kind_num);
if (!maybe_kind)
throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown serialization kind " + std::to_string(kind_num));
throw Exception(ErrorCodes::CORRUPTED_DATA, "Unknown serialization kind " + std::to_string(kind_num));
kind = *maybe_kind;
}
@ -109,7 +109,7 @@ Poco::JSON::Object SerializationInfo::toJSON() const
void SerializationInfo::fromJSON(const Poco::JSON::Object & object)
{
if (!object.has(KEY_KIND) || !object.has(KEY_NUM_DEFAULTS) || !object.has(KEY_NUM_ROWS))
throw Exception(ErrorCodes::LOGICAL_ERROR,
throw Exception(ErrorCodes::CORRUPTED_DATA,
"Missed field '{}' or '{}' or '{}' in SerializationInfo of columns",
KEY_KIND, KEY_NUM_DEFAULTS, KEY_NUM_ROWS);
@ -129,7 +129,8 @@ SerializationInfoByName::SerializationInfoByName(
const SerializationInfo::Settings & settings)
{
for (const auto & column : columns)
emplace(column.name, column.type->createSerializationInfo(settings));
if (column.type->supportsSparseSerialization())
emplace(column.name, column.type->createSerializationInfo(settings));
}
void SerializationInfoByName::add(const Block & block)
@ -138,8 +139,7 @@ void SerializationInfoByName::add(const Block & block)
{
auto it = find(column.name);
if (it == end())
throw Exception(ErrorCodes::LOGICAL_ERROR,
"Not found column {} in serialization infos", column.name);
continue;
it->second->add(*column.column);
}
@ -151,8 +151,7 @@ void SerializationInfoByName::add(const SerializationInfoByName & other)
{
auto it = find(name);
if (it == end())
throw Exception(ErrorCodes::LOGICAL_ERROR,
"Not found column {} in serialization infos", name);
continue;
it->second->add(*info);
}