Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport #53548 to 23.3: Fix crash in join on sparse column #53941

Merged
merged 1 commit into from
Aug 30, 2023
Merged

Backport #53548 to 23.3: Fix crash in join on sparse column #53941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions src/Interpreters/JoinUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,11 @@ ColumnPtr emptyNotNullableClone(const ColumnPtr & column)
return column->cloneEmpty();
}

ColumnPtr materializeColumn(const ColumnPtr & column)
{
return recursiveRemoveLowCardinality(recursiveRemoveSparse(column->convertToFullColumnIfConst()));
}

ColumnRawPtrs materializeColumnsInplace(Block & block, const Names & names)
{
ColumnRawPtrs ptrs;
Expand All @@ -317,7 +322,7 @@ ColumnRawPtrs materializeColumnsInplace(Block & block, const Names & names)
for (const auto & column_name : names)
{
auto & column = block.getByName(column_name).column;
column = recursiveRemoveLowCardinality(recursiveRemoveSparse(column->convertToFullColumnIfConst()));
column = materializeColumn(column);
ptrs.push_back(column.get());
}

Expand All @@ -332,12 +337,7 @@ ColumnPtrMap materializeColumnsInplaceMap(const Block & block, const Names & nam
for (const auto & column_name : names)
{
ColumnPtr column = block.getByName(column_name).column;

column = column->convertToFullColumnIfConst();
column = recursiveRemoveLowCardinality(column);
column = recursiveRemoveSparse(column);

ptrs[column_name] = column;
ptrs[column_name] = materializeColumn(column);
}

return ptrs;
Expand All @@ -346,8 +346,7 @@ ColumnPtrMap materializeColumnsInplaceMap(const Block & block, const Names & nam
ColumnPtr materializeColumn(const Block & block, const String & column_name)
{
const auto & src_column = block.getByName(column_name).column;
return recursiveRemoveLowCardinality(
recursiveRemoveSparse(src_column->convertToFullColumnIfConst()));
return materializeColumn(src_column);
}

Columns materializeColumns(const Block & block, const Names & names)
Expand Down Expand Up @@ -545,7 +544,7 @@ JoinMask getColumnAsMask(const Block & block, const String & column_name)
return JoinMask(const_cond->getBool(0), block.rows());
}

ColumnPtr join_condition_col = recursiveRemoveLowCardinality(src_col.column->convertToFullColumnIfConst());
ColumnPtr join_condition_col = materializeColumn(src_col.column);
if (const auto * nullable_col = typeid_cast<const ColumnNullable *>(join_condition_col.get()))
{
if (isNothing(assert_cast<const DataTypeNullable &>(*col_type).getNestedType()))
Expand Down
1 change: 1 addition & 0 deletions tests/queries/0_stateless/02845_join_on_cond_sparse.reference
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0 1 0 0
21 changes: 21 additions & 0 deletions tests/queries/0_stateless/02845_join_on_cond_sparse.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;

CREATE TABLE t1 ( id UInt32, attr UInt32 ) ENGINE = MergeTree ORDER BY id
SETTINGS ratio_of_defaults_for_sparse_serialization = 0.1;

INSERT INTO t1 VALUES (0, 0);

CREATE TABLE t2 ( id UInt32, attr UInt32 ) ENGINE = MergeTree ORDER BY id
SETTINGS ratio_of_defaults_for_sparse_serialization = 0.1;

INSERT INTO t2 VALUES (0, 0);

SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND t1.attr != 0;

INSERT INTO t1 VALUES (0, 1);

SELECT * FROM t1 JOIN t2 ON t1.id = t2.id AND t1.attr != 0;

DROP TABLE IF EXISTS t1;
DROP TABLE IF EXISTS t2;