thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-28 20:50:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Sergey Magidovich 2015-03-20 14:27:36 +03:00
commit 72ed02d5e8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
View File

@ -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)
{ {