mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-26 09:32:01 +00:00
fix style
This commit is contained in:
parent
a64b8afc7e
commit
d4ec3bbf70
@ -485,7 +485,7 @@ namespace
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Join::prepareBlockListStructure(Block& stored_block)
|
void Join::prepareBlockListStructure(Block & stored_block)
|
||||||
{
|
{
|
||||||
if (isRightOrFull(kind))
|
if (isRightOrFull(kind))
|
||||||
{
|
{
|
||||||
@ -597,7 +597,7 @@ public:
|
|||||||
const Block & block_with_columns_to_add,
|
const Block & block_with_columns_to_add,
|
||||||
const Block & block,
|
const Block & block,
|
||||||
const Block & blocklist_sample,
|
const Block & blocklist_sample,
|
||||||
const ColumnsWithTypeAndName& extras)
|
const ColumnsWithTypeAndName & extras)
|
||||||
{
|
{
|
||||||
size_t num_columns_to_add = sample_block_with_columns_to_add.columns();
|
size_t num_columns_to_add = sample_block_with_columns_to_add.columns();
|
||||||
|
|
||||||
@ -614,10 +614,10 @@ public:
|
|||||||
addColumn(src_column);
|
addColumn(src_column);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (auto& extra : extras)
|
for (auto & extra : extras)
|
||||||
addColumn(extra);
|
addColumn(extra);
|
||||||
|
|
||||||
for (auto& tn : type_name)
|
for (auto & tn : type_name)
|
||||||
right_indexes.push_back(blocklist_sample.getPositionByName(tn.second));
|
right_indexes.push_back(blocklist_sample.getPositionByName(tn.second));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -378,7 +378,6 @@ private:
|
|||||||
Block sample_block_with_keys;
|
Block sample_block_with_keys;
|
||||||
|
|
||||||
/// Block as it would appear in the BlockList
|
/// Block as it would appear in the BlockList
|
||||||
void prepareBlockListStructure(Block& stored_block);
|
|
||||||
Block blocklist_sample;
|
Block blocklist_sample;
|
||||||
|
|
||||||
Poco::Logger * log;
|
Poco::Logger * log;
|
||||||
@ -397,6 +396,11 @@ private:
|
|||||||
|
|
||||||
void init(Type type_);
|
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.
|
/// 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;
|
void checkTypesOfKeys(const Block & block_left, const Names & key_names_left, const Block & block_right) const;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user