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

avoid errors with compact non-adaptive parts

Browse Source
This commit is contained in:
CurtizJ 2020-01-13 19:28:29 +03:00
parent bae3aa3c6e
commit 1011675b11
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -237,6 +237,8 @@ MergeTreeData::MergeTreeData(
"MergeTree data format version on disk doesn't support custom partitioning",
ErrorCodes::METADATA_MISMATCH);
}
checkCanUsePolymorphicParts(true);
}
@ -1567,6 +1569,9 @@ AlterAnalysisResult MergeTreeData::analyzeAlterConversions(
MergeTreeDataPartType MergeTreeData::choosePartType(size_t bytes_uncompressed, size_t rows_count) const
{
if (!canUseAdaptiveGranularity())
return MergeTreeDataPartType::WIDE;
const auto settings = getSettings();
if (bytes_uncompressed < settings->min_bytes_for_wide_part || rows_count < settings->min_rows_for_wide_part)
return MergeTreeDataPartType::COMPACT;
@ -1584,7 +1589,7 @@ MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(const String & name,
else if (type == MergeTreeDataPartType::WIDE)
return std::make_shared<MergeTreeDataPartWide>(*this, name, part_info, disk, relative_path);
else
throw Exception("Unknown part type", ErrorCodes::LOGICAL_ERROR);
throw Exception("Unknown type in part " + relative_path, ErrorCodes::UNKNOWN_PART_TYPE);
}
MergeTreeData::MutableDataPartPtr MergeTreeData::createPart(
@ -1818,6 +1823,7 @@ void MergeTreeData::changeSettings(
copy.applyChanges(new_changes);
storage_settings.set(std::make_unique<const MergeTreeSettings>(copy));
settings_ast = new_settings;
checkCanUsePolymorphicParts(false);
}
}
@ -3808,4 +3814,26 @@ bool MergeTreeData::moveParts(CurrentlyMovingPartsTagger && moving_tagger)
return true;
}
void MergeTreeData::checkCanUsePolymorphicParts(bool no_throw)
{
const auto settings = getSettings();
if (!canUseAdaptiveGranularity() && (settings->min_rows_for_wide_part != 0 || settings->min_bytes_for_wide_part != 0))
{
std::ostringstream message;
message << "Table can't create parts with adaptive granularity, but settings min_rows_for_wide_part = "
<< settings->min_rows_for_wide_part << ", min_bytes_for_wide_part = " << settings->min_bytes_for_wide_part
<< ". Parts with non-adaptive granularity can be stored only in Wide (default) format.";
if (no_throw)
{
message << " Settings 'min_bytes_for_wide_part' and 'min_bytes_for_wide_part' will be ignored further.";
LOG_WARNING(log, message.str());
}
else
{
throw Exception(message.str(), ErrorCodes::NOT_IMPLEMENTED);
}
}
}
}

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

@ -1017,6 +1017,8 @@ private:
/// Check selected parts for movements. Used by ALTER ... MOVE queries.
CurrentlyMovingPartsTagger checkPartsForMove(const DataPartsVector & parts, SpacePtr space);
void checkCanUsePolymorphicParts(bool no_throw);
};
}