thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 09:32:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build.

Browse Source
This commit is contained in:
Nikolai Kochetov 2019-01-29 13:56:44 +03:00
parent f7b9059dad
commit 5d29562302
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dbms/src/Interpreters/Join.cpp
View File

@ -494,7 +494,7 @@ bool Join::insertFromBlock(const Block & block)
{ {
dispatch([&](auto, auto strictness_, auto & map) dispatch([&](auto, auto strictness_, auto & map)
{ {
insertFromBlockImpl<strictness_>(type, map, rows, key_columns, keys_size, key_sizes, stored_block, null_map, pool); insertFromBlockImpl<strictness_>(type, map, rows, key_columns, key_sizes, stored_block, null_map, pool);
}); });
} }
@ -617,9 +617,10 @@ namespace
if (find_result.isFound()) if (find_result.isFound())
{ {
it->second.setUsed(); auto & mapped = find_result.getMapped();
mapped.setUsed();
Adder<Join::KindTrait<KIND>::pad_left, STRICTNESS, Map>::addFound( Adder<Join::KindTrait<KIND>::pad_left, STRICTNESS, Map>::addFound(
it, num_columns_to_add, added_columns, i, filter.get(), current_offset, offsets_to_replicate.get(), right_indexes); mapped, num_columns_to_add, added_columns, i, filter.get(), current_offset, offsets_to_replicate.get(), right_indexes);
} }
else else
Adder<Join::KindTrait<KIND>::pad_left, STRICTNESS, Map>::addNotFound( Adder<Join::KindTrait<KIND>::pad_left, STRICTNESS, Map>::addNotFound(
@ -746,7 +747,7 @@ void Join::joinBlockImpl(
{ {
#define M(TYPE) \ #define M(TYPE) \
case Join::Type::TYPE: \ case Join::Type::TYPE: \
joinBlockImplType<KIND, STRICTNESS, typename KeyGetterForType<Join::Type::TYPE, const std::remove_reference_t<decltype(*maps.TYPE)>>::Type>(\ joinBlockImplType<KIND, STRICTNESS, typename KeyGetterForType<Join::Type::TYPE, const std::remove_reference_t<decltype(*maps_.TYPE)>>::Type>(\
*maps_.TYPE, rows, key_columns, key_sizes, added_columns, null_map, \ *maps_.TYPE, rows, key_columns, key_sizes, added_columns, null_map, \
filter, current_offset, offsets_to_replicate, right_indexes); \ filter, current_offset, offsets_to_replicate, right_indexes); \
break; break;