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

Merge branch 'master' into in-memory-compression

Browse Source
This commit is contained in:
Alexey Milovidov 2021-02-15 00:00:47 +03:00
commit 459ea4132d
5 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Interpreters/TableJoin.cpp
View File

@ -230,8 +230,16 @@ void TableJoin::addJoinedColumn(const NameAndTypePair & joined_column)
void TableJoin::addJoinedColumnsAndCorrectNullability(ColumnsWithTypeAndName & columns) const
{
for (auto & col : columns)
{
if (leftBecomeNullable(col.type))
col.type = makeNullable(col.type);
{
/// No need to nullify constants
if (!(col.column && isColumnConst(*col.column)))
{
col.type = makeNullable(col.type);
}
}
}
for (const auto & col : columns_added_by_join)
{

3
tests/queries/0_stateless/01710_join_use_nulls.reference
View File

@ -0,0 +1,3 @@
3
1
1

16
tests/queries/0_stateless/01710_join_use_nulls.sql
View File

@ -5,11 +5,17 @@ CREATE TABLE X (id Int) ENGINE=Memory;
CREATE TABLE Y (id Int) ENGINE=Memory;
-- Type mismatch of columns to JOIN by: plus(id, 1) Int64 at left, Y.id Int32 at right.
SELECT
Y.id - 1
FROM X
RIGHT JOIN Y ON (X.id + 1) = Y.id
SETTINGS join_use_nulls=1; -- { serverError 53 }
SELECT Y.id - 1 FROM X RIGHT JOIN Y ON (X.id + 1) = Y.id SETTINGS join_use_nulls=1; -- { serverError 53 }
SELECT Y.id - 1 FROM X RIGHT JOIN Y ON (X.id + 1) = toInt64(Y.id) SETTINGS join_use_nulls=1;
-- Logical error: 'Arguments of 'plus' have incorrect data types: '2' of type 'UInt8', '1' of type 'UInt8''.
-- Because 1 became toNullable(1), i.e.:
-- 2 UInt8 Const(size = 1, UInt8(size = 1))
-- 1 UInt8 Const(size = 1, Nullable(size = 1, UInt8(size = 1), UInt8(size = 1)))
SELECT 2+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy+1 = Y.dummy SETTINGS join_use_nulls = 1; -- { serverError 53 }
SELECT 2+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy+1 = toUInt16(Y.dummy) SETTINGS join_use_nulls = 1;
SELECT X.dummy+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy = Y.dummy SETTINGS join_use_nulls = 1;
SELECT Y.dummy+1 FROM system.one X RIGHT JOIN system.one Y ON X.dummy = Y.dummy SETTINGS join_use_nulls = 1;
DROP TABLE X;
DROP TABLE Y;

14
tests/queries/skip_list.json
View File

@ -10,6 +10,7 @@
"00152_insert_different_granularity",
"00151_replace_partition_with_different_granularity",
"00157_cache_dictionary",
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"01193_metadata_loading",
"01473_event_time_microseconds",
"01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
@ -25,6 +26,7 @@
"memory_profiler",
"odbc_roundtrip",
"01103_check_cpu_instructions_at_startup",
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"01473_event_time_microseconds",
"01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
"01193_metadata_loading"
@ -35,6 +37,7 @@
"memory_profiler",
"01103_check_cpu_instructions_at_startup",
"00900_orc_load",
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"01473_event_time_microseconds",
"01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
"01193_metadata_loading"
@ -46,6 +49,7 @@
"01103_check_cpu_instructions_at_startup",
"01086_odbc_roundtrip", /// can't pass because odbc libraries are not instrumented
"00877_memory_limit_for_new_delete", /// memory limits don't work correctly under msan because it replaces malloc/free
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"01473_event_time_microseconds",
"01526_max_untracked_memory", /// requires TraceCollector, does not available under sanitizers
"01193_metadata_loading"
@ -57,6 +61,7 @@
"00980_alter_settings_race",
"00834_kill_mutation_replicated_zookeeper",
"00834_kill_mutation",
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"01200_mutations_memory_consumption",
"01103_check_cpu_instructions_at_startup",
"01037_polygon_dicts_",
@ -82,6 +87,7 @@
"00505_secure",
"00505_shard_secure",
"odbc_roundtrip",
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"01103_check_cpu_instructions_at_startup",
"01114_mysql_database_engine_segfault",
"00834_cancel_http_readonly_queries_on_client_close",
@ -95,16 +101,19 @@
"01455_time_zones"
],
"release-build": [
"00992_system_parts_race_condition_zookeeper" /// TODO remove me (alesapin)
],
"database-ordinary": [
"00604_show_create_database",
"00609_mv_index_in_in",
"00510_materizlized_view_and_deduplication_zookeeper",
"00738_lock_for_inner_table"
"00738_lock_for_inner_table",
"00992_system_parts_race_condition_zookeeper" /// TODO remove me (alesapin)
],
"polymorphic-parts": [
"01508_partition_pruning_long", /// bug, shoud be fixed
"01482_move_to_prewhere_and_cast" /// bug, shoud be fixed
"01482_move_to_prewhere_and_cast", /// bug, shoud be fixed
"00992_system_parts_race_condition_zookeeper" /// TODO remove me (alesapin)
],
"antlr": [
"00186_very_long_arrays",
@ -144,6 +153,7 @@
"00982_array_enumerate_uniq_ranked",
"00984_materialized_view_to_columns",
"00988_constraints_replication_zookeeper",
"00992_system_parts_race_condition_zookeeper", /// TODO remove me (alesapin)
"00995_order_by_with_fill",
"01001_enums_in_in_section",
"01011_group_uniq_array_memsan",

3
utils/list-versions/version_date.tsv
View File

@ -1,6 +1,9 @@
v21.2.3.15-stable 2021-02-14
v21.2.2.8-stable 2021-02-07
v21.1.4.46-stable 2021-02-14
v21.1.3.32-stable 2021-02-03
v21.1.2.15-stable 2021-01-18
v20.12.6.29-stable 2021-02-14
v20.12.5.18-stable 2021-02-03
v20.12.5.14-stable 2020-12-28
v20.12.4.5-stable 2020-12-24

1 v21.2.2.8-stable v21.2.3.15-stable 2021-02-07 2021-02-14
1 v21.2.3.15-stable 2021-02-14
2 v21.2.2.8-stable v21.2.2.8-stable 2021-02-07 2021-02-07
3 v21.1.4.46-stable 2021-02-14
4 v21.1.3.32-stable v21.1.3.32-stable 2021-02-03 2021-02-03
5 v21.1.2.15-stable v21.1.2.15-stable 2021-01-18 2021-01-18
6 v20.12.6.29-stable 2021-02-14
7 v20.12.5.18-stable v20.12.5.18-stable 2021-02-03 2021-02-03
8 v20.12.5.14-stable v20.12.5.14-stable 2020-12-28 2020-12-28
9 v20.12.4.5-stable v20.12.4.5-stable 2020-12-24 2020-12-24