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

revert TypeIndex, another fix for T64 (#9033)

Browse Source
This commit is contained in:
Artem Zuikov 2020-02-07 03:04:25 +03:00 committed by GitHub
parent 2d94498537
commit 31a3f3b48b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 109 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
dbms/src/Compression/CompressionCodecT64.cpp
View File

@ -23,6 +23,78 @@ extern const int LOGICAL_ERROR;
namespace namespace
{ {
/// Fixed TypeIds that numbers would not be changed between versions.
enum class MagicNumber : uint8_t
{
UInt8 = 1,
UInt16 = 2,
UInt32 = 3,
UInt64 = 4,
Int8 = 6,
Int16 = 7,
Int32 = 8,
Int64 = 9,
Date = 13,
DateTime = 14,
DateTime64 = 15,
Enum8 = 17,
Enum16 = 18,
Decimal32 = 19,
Decimal64 = 20,
};
MagicNumber serializeTypeId(TypeIndex type_id)
{
switch (type_id)
{
case TypeIndex::UInt8: return MagicNumber::UInt8;
case TypeIndex::UInt16: return MagicNumber::UInt16;
case TypeIndex::UInt32: return MagicNumber::UInt32;
case TypeIndex::UInt64: return MagicNumber::UInt64;
case TypeIndex::Int8: return MagicNumber::Int8;
case TypeIndex::Int16: return MagicNumber::Int16;
case TypeIndex::Int32: return MagicNumber::Int32;
case TypeIndex::Int64: return MagicNumber::Int64;
case TypeIndex::Date: return MagicNumber::Date;
case TypeIndex::DateTime: return MagicNumber::DateTime;
case TypeIndex::DateTime64: return MagicNumber::DateTime64;
case TypeIndex::Enum8: return MagicNumber::Enum8;
case TypeIndex::Enum16: return MagicNumber::Enum16;
case TypeIndex::Decimal32: return MagicNumber::Decimal32;
case TypeIndex::Decimal64: return MagicNumber::Decimal64;
default:
break;
}
throw Exception("Type is not supported by T64 codec: " + toString(UInt32(type_id)), ErrorCodes::LOGICAL_ERROR);
}
TypeIndex deserializeTypeId(uint8_t serialized_type_id)
{
MagicNumber magic = static_cast<MagicNumber>(serialized_type_id);
switch (magic)
{
case MagicNumber::UInt8: return TypeIndex::UInt8;
case MagicNumber::UInt16: return TypeIndex::UInt16;
case MagicNumber::UInt32: return TypeIndex::UInt32;
case MagicNumber::UInt64: return TypeIndex::UInt64;
case MagicNumber::Int8: return TypeIndex::Int8;
case MagicNumber::Int16: return TypeIndex::Int16;
case MagicNumber::Int32: return TypeIndex::Int32;
case MagicNumber::Int64: return TypeIndex::Int64;
case MagicNumber::Date: return TypeIndex::Date;
case MagicNumber::DateTime: return TypeIndex::DateTime;
case MagicNumber::DateTime64: return TypeIndex::DateTime64;
case MagicNumber::Enum8: return TypeIndex::Enum8;
case MagicNumber::Enum16: return TypeIndex::Enum16;
case MagicNumber::Decimal32: return TypeIndex::Decimal32;
case MagicNumber::Decimal64: return TypeIndex::Decimal64;
}
throw Exception("Bad magic number in T64 codec: " + toString(UInt32(serialized_type_id)), ErrorCodes::LOGICAL_ERROR);
}
UInt8 codecId() UInt8 codecId()
{ {
return static_cast<UInt8>(CompressionMethodByte::T64); return static_cast<UInt8>(CompressionMethodByte::T64);
@ -41,6 +113,7 @@ TypeIndex baseType(TypeIndex type_idx)
return TypeIndex::Int32; return TypeIndex::Int32;
case TypeIndex::Int64: case TypeIndex::Int64:
case TypeIndex::Decimal64: case TypeIndex::Decimal64:
case TypeIndex::DateTime64:
return TypeIndex::Int64; return TypeIndex::Int64;
case TypeIndex::UInt8: case TypeIndex::UInt8:
case TypeIndex::Enum8: case TypeIndex::Enum8:
@ -79,6 +152,7 @@ TypeIndex typeIdx(const DataTypePtr & data_type)
case TypeIndex::Int32: case TypeIndex::Int32:
case TypeIndex::UInt32: case TypeIndex::UInt32:
case TypeIndex::DateTime: case TypeIndex::DateTime:
case TypeIndex::DateTime64:
case TypeIndex::Decimal32: case TypeIndex::Decimal32:
case TypeIndex::Int64: case TypeIndex::Int64:
case TypeIndex::UInt64: case TypeIndex::UInt64:
@ -490,7 +564,7 @@ void decompressData(const char * src, UInt32 src_size, char * dst, UInt32 uncomp
UInt32 CompressionCodecT64::doCompressData(const char * src, UInt32 src_size, char * dst) const UInt32 CompressionCodecT64::doCompressData(const char * src, UInt32 src_size, char * dst) const
{ {
UInt8 cookie = static_cast<UInt8>(type_idx) | (static_cast<UInt8>(variant) << 7); UInt8 cookie = static_cast<UInt8>(serializeTypeId(type_idx)) | (static_cast<UInt8>(variant) << 7);
memcpy(dst, &cookie, 1); memcpy(dst, &cookie, 1);
dst += 1; dst += 1;
@ -529,7 +603,7 @@ void CompressionCodecT64::doDecompressData(const char * src, UInt32 src_size, ch
src_size -= 1; src_size -= 1;
auto saved_variant = static_cast<Variant>(cookie >> 7); auto saved_variant = static_cast<Variant>(cookie >> 7);
auto saved_type_id = static_cast<TypeIndex>(cookie & 0x7F); TypeIndex saved_type_id = deserializeTypeId(cookie & 0x7F);
switch (baseType(saved_type_id)) switch (baseType(saved_type_id))
{ {

65
dbms/src/Core/Types.h
View File

@ -14,42 +14,41 @@ namespace DB
struct Null {}; struct Null {};
/// @warning Append only enum! Ids in this enum could be serialized in data. /// @note Except explicitly described you should not assume on TypeIndex numbers and/or their orders in this enum.
/// You MUST NOT change the order, insert or remove ids in the middle.
enum class TypeIndex enum class TypeIndex
{ {
Nothing = 0, Nothing = 0,
UInt8 = 1, UInt8,
UInt16 = 2, UInt16,
UInt32 = 3, UInt32,
UInt64 = 4, UInt64,
UInt128 = 5, UInt128,
Int8 = 6, Int8,
Int16 = 7, Int16,
Int32 = 8, Int32,
Int64 = 9, Int64,
Int128 = 10, Int128,
Float32 = 11, Float32,
Float64 = 12, Float64,
Date = 13, Date,
DateTime = 14, DateTime,
String = 15, DateTime64,
FixedString = 16, String,
Enum8 = 17, FixedString,
Enum16 = 18, Enum8,
Decimal32 = 19, Enum16,
Decimal64 = 20, Decimal32,
Decimal128 = 21, Decimal64,
UUID = 22, Decimal128,
Array = 23, UUID,
Tuple = 24, Array,
Set = 25, Tuple,
Interval = 26, Set,
Nullable = 27, Interval,
Function = 28, Nullable,
AggregateFunction = 29, Function,
LowCardinality = 30, AggregateFunction,
DateTime64 = 31, LowCardinality,
}; };
using UInt8 = uint8_t; using UInt8 = uint8_t;