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

fix style

Browse Source
This commit is contained in:
Martijn Bakker 2019-04-01 11:35:37 +01:00
parent a64b8afc7e
commit d4ec3bbf70
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -485,7 +485,7 @@ namespace
}
}
void Join::prepareBlockListStructure(Block& stored_block)
void Join::prepareBlockListStructure(Block & stored_block)
{
if (isRightOrFull(kind))
{
@ -597,7 +597,7 @@ public:
const Block & block_with_columns_to_add,
const Block & block,
const Block & blocklist_sample,
const ColumnsWithTypeAndName& extras)
const ColumnsWithTypeAndName & extras)
{
size_t num_columns_to_add = sample_block_with_columns_to_add.columns();
@ -614,10 +614,10 @@ public:
addColumn(src_column);
}
for (auto& extra : extras)
for (auto & extra : extras)
addColumn(extra);
for (auto& tn : type_name)
for (auto & tn : type_name)
right_indexes.push_back(blocklist_sample.getPositionByName(tn.second));
}

6
dbms/src/Interpreters/Join.h
View File

@ -378,7 +378,6 @@ private:
Block sample_block_with_keys;
/// Block as it would appear in the BlockList
void prepareBlockListStructure(Block& stored_block);
Block blocklist_sample;
Poco::Logger * log;
@ -397,6 +396,11 @@ private:
void init(Type type_);
/** Take an inserted block and discard everything that does not need to be stored
* Example, remove the keys as they come from the LHS block, but do keep the ASOF timestamps
*/
void prepareBlockListStructure(Block & stored_block);
/// Throw an exception if blocks have different types of key columns.
void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const Block & block_right) const;