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

Cast columns to sample structure for StirageJoin::read

Browse Source
This commit is contained in:
Nikolai Kochetov 2020-11-25 15:41:12 +03:00
parent d6dd133bee
commit 89ee8aefd9
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Storages/StorageJoin.cpp
View File

@ -10,6 +10,7 @@
#include <DataTypes/NestedUtils.h> #include <DataTypes/NestedUtils.h>
#include <Interpreters/joinDispatch.h> #include <Interpreters/joinDispatch.h>
#include <Interpreters/TableJoin.h> #include <Interpreters/TableJoin.h>
#include <Interpreters/castColumn.h>
#include <Common/assert_cast.h> #include <Common/assert_cast.h>
#include <Common/quoteString.h> #include <Common/quoteString.h>
@ -321,7 +322,7 @@ private:
template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps> template <ASTTableJoin::Kind KIND, ASTTableJoin::Strictness STRICTNESS, typename Maps>
Chunk createChunk(const Maps & maps) Chunk createChunk(const Maps & maps)
{ {
MutableColumns columns = restored_block.cloneEmpty().mutateColumns(); MutableColumns mut_columns = restored_block.cloneEmpty().mutateColumns();
size_t rows_added = 0; size_t rows_added = 0;
@ -329,7 +330,7 @@ private:
{ {
#define M(TYPE) \ #define M(TYPE) \
case HashJoin::Type::TYPE: \ case HashJoin::Type::TYPE: \
rows_added = fillColumns<KIND, STRICTNESS>(*maps.TYPE, columns); \ rows_added = fillColumns<KIND, STRICTNESS>(*maps.TYPE, mut_columns); \
break; break;
APPLY_FOR_JOIN_VARIANTS_LIMITED(M) APPLY_FOR_JOIN_VARIANTS_LIMITED(M)
#undef M #undef M
@ -342,19 +343,23 @@ private:
if (!rows_added) if (!rows_added)
return {}; return {};
/// Correct nullability Columns columns;
columns.reserve(mut_columns.size());
for (auto & col : mut_columns)
columns.emplace_back(std::move(col));
/// Correct nullability and LowCardinality types
for (size_t i = 0; i < columns.size(); ++i) for (size_t i = 0; i < columns.size(); ++i)
{ {
bool src_nullable = restored_block.getByPosition(i).type->isNullable(); const auto & src = restored_block.getByPosition(i);
bool dst_nullable = sample_block.getByPosition(i).type->isNullable(); const auto & dst = sample_block.getByPosition(i);
if (src_nullable && !dst_nullable) if (!src.type->equals(*dst.type))
{ {
auto & nullable_column = assert_cast<ColumnNullable &>(*columns[i]); auto arg = src;
columns[i] = nullable_column.getNestedColumnPtr()->assumeMutable(); arg.column = std::move(columns[i]);
columns[i] = castColumn(arg, dst.type);
} }
else if (!src_nullable && dst_nullable)
columns[i] = makeNullable(std::move(columns[i]))->assumeMutable();
} }
UInt64 num_rows = columns.at(0)->size(); UInt64 num_rows = columns.at(0)->size();