mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 16:50:48 +00:00
Merge pull request #52835 from CurtizJ/change-protocol-version
Increase min protocol version for sparse serialization
This commit is contained in:
commit
923ee958c7
@ -46,15 +46,6 @@
|
|||||||
|
|
||||||
#define DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION 54454
|
#define DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION 54454
|
||||||
|
|
||||||
/// Version of ClickHouse TCP protocol.
|
|
||||||
///
|
|
||||||
/// Should be incremented manually on protocol changes.
|
|
||||||
///
|
|
||||||
/// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
|
|
||||||
/// later is just a number for server version (one number instead of commit SHA)
|
|
||||||
/// for simplicity (sometimes it may be more convenient in some use cases).
|
|
||||||
#define DBMS_TCP_PROTOCOL_VERSION 54464
|
|
||||||
|
|
||||||
#define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
|
#define DBMS_MIN_PROTOCOL_VERSION_WITH_INITIAL_QUERY_START_TIME 54449
|
||||||
|
|
||||||
#define DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS_IN_INSERT 54456
|
#define DBMS_MIN_PROTOCOL_VERSION_WITH_PROFILE_EVENTS_IN_INSERT 54456
|
||||||
@ -77,3 +68,14 @@
|
|||||||
#define DBMS_MIN_PROTOCOL_VERSION_WITH_TOTAL_BYTES_IN_PROGRESS 54463
|
#define DBMS_MIN_PROTOCOL_VERSION_WITH_TOTAL_BYTES_IN_PROGRESS 54463
|
||||||
|
|
||||||
#define DBMS_MIN_PROTOCOL_VERSION_WITH_TIMEZONE_UPDATES 54464
|
#define DBMS_MIN_PROTOCOL_VERSION_WITH_TIMEZONE_UPDATES 54464
|
||||||
|
|
||||||
|
#define DBMS_MIN_REVISION_WITH_SPARSE_SERIALIZATION 54465
|
||||||
|
|
||||||
|
/// Version of ClickHouse TCP protocol.
|
||||||
|
///
|
||||||
|
/// Should be incremented manually on protocol changes.
|
||||||
|
///
|
||||||
|
/// NOTE: DBMS_TCP_PROTOCOL_VERSION has nothing common with VERSION_REVISION,
|
||||||
|
/// later is just a number for server version (one number instead of commit SHA)
|
||||||
|
/// for simplicity (sometimes it may be more convenient in some use cases).
|
||||||
|
#define DBMS_TCP_PROTOCOL_VERSION 54465
|
||||||
|
@ -135,9 +135,19 @@ size_t NativeWriter::write(const Block & block)
|
|||||||
if (client_revision >= DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION)
|
if (client_revision >= DBMS_MIN_REVISION_WITH_CUSTOM_SERIALIZATION)
|
||||||
{
|
{
|
||||||
auto info = column.type->getSerializationInfo(*column.column);
|
auto info = column.type->getSerializationInfo(*column.column);
|
||||||
serialization = column.type->getSerialization(*info);
|
bool has_custom = false;
|
||||||
|
|
||||||
|
if (client_revision >= DBMS_MIN_REVISION_WITH_SPARSE_SERIALIZATION)
|
||||||
|
{
|
||||||
|
serialization = column.type->getSerialization(*info);
|
||||||
|
has_custom = info->hasCustomSerialization();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
serialization = column.type->getDefaultSerialization();
|
||||||
|
column.column = recursiveRemoveSparse(column.column);
|
||||||
|
}
|
||||||
|
|
||||||
bool has_custom = info->hasCustomSerialization();
|
|
||||||
writeBinary(static_cast<UInt8>(has_custom), ostr);
|
writeBinary(static_cast<UInt8>(has_custom), ostr);
|
||||||
if (has_custom)
|
if (has_custom)
|
||||||
info->serialializeKindBinary(ostr);
|
info->serialializeKindBinary(ostr);
|
||||||
|
Loading…
Reference in New Issue
Block a user