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 tests and builds

Browse Source
This commit is contained in:
avogar 2024-10-09 03:14:48 +00:00
parent c6b58f4db2
commit c4cc4cca91
6 changed files with 88 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ MergeTreeDataPartWriterCompact::MergeTreeDataPartWriterCompact(
for (const auto & column : columns_list)
{
auto compression = getCodecDescOrDefault(column.name, default_codec);
addStreams(column, nullptr, compression);
MergeTreeDataPartWriterCompact::addStreams(column, nullptr, compression);
}
}

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

@ -102,7 +102,7 @@ MergeTreeDataPartWriterWide::MergeTreeDataPartWriterWide(
for (const auto & column : columns_list)
{
auto compression = getCodecDescOrDefault(column.name, default_codec);
addStreams(column, nullptr, compression);
MergeTreeDataPartWriterWide::addStreams(column, nullptr, compression);
}
}

160
tests/queries/0_stateless/03246_alter_from_string_to_json.reference
View File

@ -15,26 +15,26 @@ key5
{"key1":"value7"}
{"key0":"value8"}
{"key1":"value9"}
{"key2":"value300000"}
{"key3":"value300001"}
{"key2":"value300002"}
{"key3":"value300003"}
{"key2":"value300004"}
{"key3":"value300005"}
{"key2":"value300006"}
{"key3":"value300007"}
{"key2":"value300008"}
{"key3":"value300009"}
{"key4":"value600000"}
{"key5":"value600001"}
{"key4":"value600002"}
{"key5":"value600003"}
{"key4":"value600004"}
{"key5":"value600005"}
{"key4":"value600006"}
{"key5":"value600007"}
{"key4":"value600008"}
{"key5":"value600009"}
{"key2":"value60000"}
{"key3":"value60001"}
{"key2":"value60002"}
{"key3":"value60003"}
{"key2":"value60004"}
{"key3":"value60005"}
{"key2":"value60006"}
{"key3":"value60007"}
{"key2":"value60008"}
{"key3":"value60009"}
{"key4":"value120000"}
{"key5":"value120001"}
{"key4":"value120002"}
{"key5":"value120003"}
{"key4":"value120004"}
{"key5":"value120005"}
{"key4":"value120006"}
{"key5":"value120007"}
{"key4":"value120008"}
{"key5":"value120009"}
value0 \N \N \N \N \N
\N value1 \N \N \N \N
value2 \N \N \N \N \N
@ -45,26 +45,26 @@ value6 \N \N \N \N \N
\N value7 \N \N \N \N
value8 \N \N \N \N \N
\N value9 \N \N \N \N
\N \N value300000 \N \N \N
\N \N \N value300001 \N \N
\N \N value300002 \N \N \N
\N \N \N value300003 \N \N
\N \N value300004 \N \N \N
\N \N \N value300005 \N \N
\N \N value300006 \N \N \N
\N \N \N value300007 \N \N
\N \N value300008 \N \N \N
\N \N \N value300009 \N \N
\N \N \N \N value600000 \N
\N \N \N \N \N value600001
\N \N \N \N value600002 \N
\N \N \N \N \N value600003
\N \N \N \N value600004 \N
\N \N \N \N \N value600005
\N \N \N \N value600006 \N
\N \N \N \N \N value600007
\N \N \N \N value600008 \N
\N \N \N \N \N value600009
\N \N value60000 \N \N \N
\N \N \N value60001 \N \N
\N \N value60002 \N \N \N
\N \N \N value60003 \N \N
\N \N value60004 \N \N \N
\N \N \N value60005 \N \N
\N \N value60006 \N \N \N
\N \N \N value60007 \N \N
\N \N value60008 \N \N \N
\N \N \N value60009 \N \N
\N \N \N \N value120000 \N
\N \N \N \N \N value120001
\N \N \N \N value120002 \N
\N \N \N \N \N value120003
\N \N \N \N value120004 \N
\N \N \N \N \N value120005
\N \N \N \N value120006 \N
\N \N \N \N \N value120007
\N \N \N \N value120008 \N
\N \N \N \N \N value120009
All paths:
['key0','key1','key2','key3','key4','key5']
Shared data paths:
@ -82,26 +82,26 @@ key5
{"key1":"value7"}
{"key0":"value8"}
{"key1":"value9"}
{"key2":"value300000"}
{"key3":"value300001"}
{"key2":"value300002"}
{"key3":"value300003"}
{"key2":"value300004"}
{"key3":"value300005"}
{"key2":"value300006"}
{"key3":"value300007"}
{"key2":"value300008"}
{"key3":"value300009"}
{"key4":"value600000"}
{"key5":"value600001"}
{"key4":"value600002"}
{"key5":"value600003"}
{"key4":"value600004"}
{"key5":"value600005"}
{"key4":"value600006"}
{"key5":"value600007"}
{"key4":"value600008"}
{"key5":"value600009"}
{"key2":"value60000"}
{"key3":"value60001"}
{"key2":"value60002"}
{"key3":"value60003"}
{"key2":"value60004"}
{"key3":"value60005"}
{"key2":"value60006"}
{"key3":"value60007"}
{"key2":"value60008"}
{"key3":"value60009"}
{"key4":"value120000"}
{"key5":"value120001"}
{"key4":"value120002"}
{"key5":"value120003"}
{"key4":"value120004"}
{"key5":"value120005"}
{"key4":"value120006"}
{"key5":"value120007"}
{"key4":"value120008"}
{"key5":"value120009"}
value0 \N \N \N \N \N
\N value1 \N \N \N \N
value2 \N \N \N \N \N
@ -112,23 +112,23 @@ value6 \N \N \N \N \N
\N value7 \N \N \N \N
value8 \N \N \N \N \N
\N value9 \N \N \N \N
\N \N value300000 \N \N \N
\N \N \N value300001 \N \N
\N \N value300002 \N \N \N
\N \N \N value300003 \N \N
\N \N value300004 \N \N \N
\N \N \N value300005 \N \N
\N \N value300006 \N \N \N
\N \N \N value300007 \N \N
\N \N value300008 \N \N \N
\N \N \N value300009 \N \N
\N \N \N \N value600000 \N
\N \N \N \N \N value600001
\N \N \N \N value600002 \N
\N \N \N \N \N value600003
\N \N \N \N value600004 \N
\N \N \N \N \N value600005
\N \N \N \N value600006 \N
\N \N \N \N \N value600007
\N \N \N \N value600008 \N
\N \N \N \N \N value600009
\N \N value60000 \N \N \N
\N \N \N value60001 \N \N
\N \N value60002 \N \N \N
\N \N \N value60003 \N \N
\N \N value60004 \N \N \N
\N \N \N value60005 \N \N
\N \N value60006 \N \N \N
\N \N \N value60007 \N \N
\N \N value60008 \N \N \N
\N \N \N value60009 \N \N
\N \N \N \N value120000 \N
\N \N \N \N \N value120001
\N \N \N \N value120002 \N
\N \N \N \N \N value120003
\N \N \N \N value120004 \N
\N \N \N \N \N value120005
\N \N \N \N value120006 \N
\N \N \N \N \N value120007
\N \N \N \N value120008 \N
\N \N \N \N \N value120009

11
tests/queries/0_stateless/03246_alter_from_string_to_json.sql.j2
View File

@ -1,4 +1,5 @@
set allow_experimental_json_type = 1;
set max_block_size = 20000;
drop table if exists test;
@ -7,7 +8,7 @@ drop table if exists test;
{{ create_command }}
insert into test select number, toJSONString(map('key' || multiIf(number < 300000, number % 2, number < 600000, number % 2 + 2, number % 2 + 4), 'value' || number)) from numbers(1000000);
insert into test select number, toJSONString(map('key' || multiIf(number < 60000, number % 2, number < 120000, number % 2 + 2, number % 2 + 4), 'value' || number)) from numbers(200000);
alter table test modify column json JSON settings mutations_sync=1;
@ -16,11 +17,11 @@ select distinctJSONPaths(json) from test;
select 'Shared data paths:';
select distinct (arrayJoin(JSONSharedDataPaths(json))) as path from test order by path;
select json from test order by x limit 10;
select json from test order by x limit 10 offset 300000;
select json from test order by x limit 10 offset 600000;
select json from test order by x limit 10 offset 60000;
select json from test order by x limit 10 offset 120000;
select json.key0, json.key1, json.key2, json.key3, json.key4, json.key5 from test order by x limit 10;
select json.key0, json.key1, json.key2, json.key3, json.key4, json.key5 from test order by x limit 10 offset 300000;
select json.key0, json.key1, json.key2, json.key3, json.key4, json.key5 from test order by x limit 10 offset 600000;
select json.key0, json.key1, json.key2, json.key3, json.key4, json.key5 from test order by x limit 10 offset 60000;
select json.key0, json.key1, json.key2, json.key3, json.key4, json.key5 from test order by x limit 10 offset 120000;
select json from test format Null;
select json from test order by x format Null;

0
tests/queries/0_stateless/03248_string_to_json_alter_fuzz.reference
View File

17
tests/queries/0_stateless/03248_string_to_json_alter_fuzz.sql
View File

@ -1,17 +0,0 @@
set allow_experimental_json_type=1;
set max_insert_block_size=10000;
set max_block_size=10000;
drop table if exists test;
drop named collection if exists json_alter_fuzzer;
create table test (json String) engine=MergeTree order by tuple();
create named collection json_alter_fuzzer AS json_str='{}';
insert into test select * from fuzzJSON(json_alter_fuzzer, reuse_output=true, max_output_length=64) limit 200000;
alter table test modify column json JSON(max_dynamic_paths=100) settings mutations_sync=1;
select json from test format Null;
optimize table test final;
select json from test format Null;
drop named collection json_alter_fuzzer;
drop table test;