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

Fixing warnings on clang [#METR-2807].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-03-07 07:53:17 +03:00
parent a75b6ca3dd
commit fcbe00ce94
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Dictionaries/DictionaryStructure.h
View File

@ -194,7 +194,7 @@ struct DictionaryStructure final
void validateKeyTypes(const DataTypes & key_types) const void validateKeyTypes(const DataTypes & key_types) const
{ {
if (key_types.size() != key->size()) if (key_types.size() != key.value().size())
throw Exception{ throw Exception{
"Key structure does not match, expected " + getKeyDescription(), "Key structure does not match, expected " + getKeyDescription(),
ErrorCodes::TYPE_MISMATCH ErrorCodes::TYPE_MISMATCH

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

@ -521,8 +521,10 @@ void MergeTreeData::createConvertExpression(const DataPartPtr & part, const Name
if (new_type_name != old_type->getName() && (!part || part->hasColumnFiles(column.name))) if (new_type_name != old_type->getName() && (!part || part->hasColumnFiles(column.name)))
{ {
// При ALTER между Enum с одинаковым подлежащим типом столбцы не трогаем, лишь просим обновить columns.txt // При ALTER между Enum с одинаковым подлежащим типом столбцы не трогаем, лишь просим обновить columns.txt
if (part && typeid(*new_type) == typeid(*old_type) && if (part
(typeid_cast<const DataTypeEnum8 *>(new_type) || typeid_cast<const DataTypeEnum16 *>(new_type))) && new_type->getName() == old_type->getName()
&& (typeid_cast<const DataTypeEnum8 *>(new_type)
|| typeid_cast<const DataTypeEnum16 *>(new_type)))
{ {
out_force_update_metadata = true; out_force_update_metadata = true;
continue; continue;

4
dbms/src/Storages/StorageSet.cpp
View File

@ -84,8 +84,8 @@ void StorageSetOrJoinBase::restore()
return; return;
} }
constexpr auto file_suffix = ".bin"; static const auto file_suffix = ".bin";
constexpr auto file_suffix_size = strlen(file_suffix); static const auto file_suffix_size = strlen(".bin");
Poco::DirectoryIterator dir_end; Poco::DirectoryIterator dir_end;
for (Poco::DirectoryIterator dir_it(path); dir_end != dir_it; ++dir_it) for (Poco::DirectoryIterator dir_it(path); dir_end != dir_it; ++dir_it)