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

Backport #71299 to 24.10: Fix reading of LowCardinality dictionary in Dynamic column

Browse Source
This commit is contained in:
robot-clickhouse 2024-11-01 12:10:44 +00:00
parent dbe9b61c46
commit 58fa91eb09
7 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,6 +434,14 @@ bool ISerialization::isDynamicSubcolumn(const DB::ISerialization::SubstreamPath
return false; return false;
} }
bool ISerialization::isLowCardinalityDictionarySubcolumn(const DB::ISerialization::SubstreamPath & path)
{
if (path.empty())
return false;
return path[path.size() - 1].type == SubstreamType::DictionaryKeys;
}
ISerialization::SubstreamData ISerialization::createFromPath(const SubstreamPath & path, size_t prefix_len) ISerialization::SubstreamData ISerialization::createFromPath(const SubstreamPath & path, size_t prefix_len)
{ {
assert(prefix_len <= path.size()); assert(prefix_len <= path.size());

2
src/DataTypes/Serializations/ISerialization.h
View File

@ -463,6 +463,8 @@ public:
/// Returns true if stream with specified path corresponds to dynamic subcolumn. /// Returns true if stream with specified path corresponds to dynamic subcolumn.
static bool isDynamicSubcolumn(const SubstreamPath & path, size_t prefix_len); static bool isDynamicSubcolumn(const SubstreamPath & path, size_t prefix_len);
static bool isLowCardinalityDictionarySubcolumn(const SubstreamPath & path);
protected: protected:
template <typename State, typename StatePtr> template <typename State, typename StatePtr>
State * checkAndGetState(const StatePtr & state) const; State * checkAndGetState(const StatePtr & state) const;

2
src/DataTypes/Serializations/SerializationLowCardinality.cpp
View File

@ -54,7 +54,7 @@ void SerializationLowCardinality::enumerateStreams(
.withSerializationInfo(data.serialization_info); .withSerializationInfo(data.serialization_info);
settings.path.back().data = dict_data; settings.path.back().data = dict_data;
dict_inner_serialization->enumerateStreams(settings, callback, dict_data); callback(settings.path);
settings.path.back() = Substream::DictionaryIndexes; settings.path.back() = Substream::DictionaryIndexes;
settings.path.back().data = data; settings.path.back().data = data;

2
src/Storages/MergeTree/MergeTreeReaderWide.cpp
View File

@ -262,7 +262,7 @@ MergeTreeReaderWide::FileStreams::iterator MergeTreeReaderWide::addStream(const
/*num_columns_in_mark=*/ 1); /*num_columns_in_mark=*/ 1);
auto stream_settings = settings; auto stream_settings = settings;
stream_settings.is_low_cardinality_dictionary = substream_path.size() > 1 && substream_path[substream_path.size() - 2].type == ISerialization::Substream::Type::DictionaryKeys; stream_settings.is_low_cardinality_dictionary = ISerialization::isLowCardinalityDictionarySubcolumn(substream_path);
auto create_stream = [&]<typename Stream>() auto create_stream = [&]<typename Stream>()
{ {

2
tests/queries/0_stateless/02240_get_type_serialization_streams.reference
View File

@ -1,7 +1,7 @@
['{ArraySizes}','{ArrayElements, Regular}'] ['{ArraySizes}','{ArrayElements, Regular}']
['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}'] ['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}']
['{TupleElement(1), Regular}','{TupleElement(2), Regular}','{TupleElement(3), Regular}'] ['{TupleElement(1), Regular}','{TupleElement(2), Regular}','{TupleElement(3), Regular}']
['{DictionaryKeys, Regular}','{DictionaryIndexes}'] ['{DictionaryKeys}','{DictionaryIndexes}']
['{NullMap}','{NullableElements, Regular}'] ['{NullMap}','{NullableElements, Regular}']
['{ArraySizes}','{ArrayElements, Regular}'] ['{ArraySizes}','{ArrayElements, Regular}']
['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}'] ['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}']

20
tests/queries/0_stateless/03260_dynamic_low_cardinality_dict_bug.reference Normal file
View File

@ -0,0 +1,20 @@
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678
12345678

12
tests/queries/0_stateless/03260_dynamic_low_cardinality_dict_bug.sql Normal file
View File

@ -0,0 +1,12 @@
set allow_experimental_dynamic_type = 1;
set min_bytes_to_use_direct_io = 0;
drop table if exists test;
create table test (id UInt64, d Dynamic) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, index_granularity=1, use_adaptive_write_buffer_for_dynamic_subcolumns=0, max_compress_block_size=8, min_compress_block_size=8, use_compact_variant_discriminators_serialization=0;
insert into test select number, '12345678'::LowCardinality(String) from numbers(20);
select d.`LowCardinality(String)` from test settings max_threads=1;
drop table test;