mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-28 12:40:49 +00:00
Merge
This commit is contained in:
commit
72ed02d5e8
@ -261,8 +261,10 @@ public:
|
|||||||
/// remove added column to ensure same content among all blocks
|
/// remove added column to ensure same content among all blocks
|
||||||
if (added_column)
|
if (added_column)
|
||||||
{
|
{
|
||||||
|
res.erase(0);
|
||||||
streams.erase(added_column->name);
|
streams.erase(added_column->name);
|
||||||
columns.erase(std::begin(columns));
|
columns.erase(std::begin(columns));
|
||||||
|
added_column = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// sort columns to ensure consistent order among all blocks
|
/// sort columns to ensure consistent order among all blocks
|
||||||
@ -283,12 +285,6 @@ public:
|
|||||||
|
|
||||||
std::swap(res, ordered_block);
|
std::swap(res, ordered_block);
|
||||||
}
|
}
|
||||||
else if (added_column)
|
|
||||||
{
|
|
||||||
res.erase(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
added_column = nullptr;
|
|
||||||
}
|
}
|
||||||
catch (const Exception & e)
|
catch (const Exception & e)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user