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

Some fixes

Browse Source
This commit is contained in:
alesapin 2019-03-20 23:01:15 +03:00
parent 09e57eb0ee
commit ef5162e2e3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -1206,7 +1206,7 @@ void MergeTreeData::createConvertExpression(const DataPartPtr & part, const Name
if (!new_types.count(column.name)) if (!new_types.count(column.name))
{ {
/// The column was deleted. /// The column was deleted.
if (!part || part->hasColumnFiles(column.name)) if (part && part->hasColumnFiles(column.name))
{ {
column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path) column.type->enumerateStreams([&](const IDataType::SubstreamPath & substream_path)
{ {

2
dbms/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
View File

@ -1046,7 +1046,7 @@ MergeTreeDataMergerMutator::MergeAlgorithm MergeTreeDataMergerMutator::chooseMer
const NamesAndTypesList & gathering_columns, bool deduplicate) const const NamesAndTypesList & gathering_columns, bool deduplicate) const
{ {
/// TODO(alesap) remove me /// TODO(alesap) remove me
return MergeAlgorithm::Vertical; ///return MergeAlgorithm::Vertical;
if (deduplicate) if (deduplicate)
return MergeAlgorithm::Horizontal; return MergeAlgorithm::Horizontal;
if (data.settings.enable_vertical_merge_algorithm == 0) if (data.settings.enable_vertical_merge_algorithm == 0)