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

Removed convert_types_to_low_cardinality from NativeBlockInputStream.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-09-12 14:33:46 +03:00
parent 4115d79a30
commit d7596e51b7
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dbms/programs/server/TCPHandler.cpp
View File

@ -1000,8 +1000,7 @@ void TCPHandler::receiveUnexpectedData()
auto skip_block_in = std::make_shared<NativeBlockInputStream>( auto skip_block_in = std::make_shared<NativeBlockInputStream>(
*maybe_compressed_in, *maybe_compressed_in,
last_block_in.header, last_block_in.header,
client_revision, client_revision);
!connection_context.getSettingsRef().low_cardinality_allow_in_native_format);
Block skip_block = skip_block_in->read(); Block skip_block = skip_block_in->read();
throw NetException("Unexpected packet Data received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT); throw NetException("Unexpected packet Data received from client", ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT);
@ -1028,8 +1027,7 @@ void TCPHandler::initBlockInput()
state.block_in = std::make_shared<NativeBlockInputStream>( state.block_in = std::make_shared<NativeBlockInputStream>(
*state.maybe_compressed_in, *state.maybe_compressed_in,
header, header,
client_revision, client_revision);
!connection_context.getSettingsRef().low_cardinality_allow_in_native_format);
} }
} }

4
dbms/src/DataStreams/NativeBlockInputStream.cpp
View File

@ -29,8 +29,8 @@ NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, UInt64 server
{ {
} }
NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_, bool convert_types_to_low_cardinality_) NativeBlockInputStream::NativeBlockInputStream(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_)
: istr(istr_), header(header_), server_revision(server_revision_), convert_types_to_low_cardinality(convert_types_to_low_cardinality_) : istr(istr_), header(header_), server_revision(server_revision_)
{ {
} }

4
dbms/src/DataStreams/NativeBlockInputStream.h
View File

@ -65,7 +65,7 @@ public:
/// For cases when data structure (header) is known in advance. /// For cases when data structure (header) is known in advance.
/// NOTE We may use header for data validation and/or type conversions. It is not implemented. /// NOTE We may use header for data validation and/or type conversions. It is not implemented.
NativeBlockInputStream(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_, bool convert_types_to_low_cardinality_ = false); NativeBlockInputStream(ReadBuffer & istr_, const Block & header_, UInt64 server_revision_);
/// For cases when we have an index. It allows to skip columns. Only columns specified in the index will be read. /// For cases when we have an index. It allows to skip columns. Only columns specified in the index will be read.
NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_, NativeBlockInputStream(ReadBuffer & istr_, UInt64 server_revision_,
@ -91,8 +91,6 @@ private:
IndexForNativeFormat::Blocks::const_iterator index_block_end; IndexForNativeFormat::Blocks::const_iterator index_block_end;
IndexOfBlockForNativeFormat::Columns::const_iterator index_column_it; IndexOfBlockForNativeFormat::Columns::const_iterator index_column_it;
bool convert_types_to_low_cardinality = false;
/// If an index is specified, then `istr` must be CompressedReadBufferFromFile. Unused otherwise. /// If an index is specified, then `istr` must be CompressedReadBufferFromFile. Unused otherwise.
CompressedReadBufferFromFile * istr_concrete = nullptr; CompressedReadBufferFromFile * istr_concrete = nullptr;