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

Clarifications

Browse Source
This commit is contained in:
Alexey Milovidov 2020-05-26 02:47:11 +03:00
parent d4acd1af3a
commit c858f4d89c
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Storages/MergeTree/IMergeTreeDataPart.cpp
View File

@ -418,7 +418,7 @@ void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checks
loadIndexGranularity(); loadIndexGranularity();
calculateColumnsSizesOnDisk(); calculateColumnsSizesOnDisk();
loadIndex(); /// Must be called after loadIndexGranularity as it uses the value of `index_granularity` loadIndex(); /// Must be called after loadIndexGranularity as it uses the value of `index_granularity`
loadRowsCount(); /// Must be called after loadIndex() as it uses the value of `index_granularity`. loadRowsCount(); /// Must be called after loadIndexGranularity() as it uses the value of `index_granularity`.
loadPartitionAndMinMaxIndex(); loadPartitionAndMinMaxIndex();
loadTTLInfos(); loadTTLInfos();
@ -454,16 +454,18 @@ void IMergeTreeDataPart::loadIndex()
String index_path = getFullRelativePath() + "primary.idx"; String index_path = getFullRelativePath() + "primary.idx";
auto index_file = openForReading(volume->getDisk(), index_path); auto index_file = openForReading(volume->getDisk(), index_path);
for (size_t i = 0; i < index_granularity.getMarksCount(); ++i) //-V756 size_t marks_count = index_granularity.getMarksCount();
for (size_t i = 0; i < marks_count; ++i) //-V756
for (size_t j = 0; j < key_size; ++j) for (size_t j = 0; j < key_size; ++j)
primary_key.data_types[j]->deserializeBinary(*loaded_index[j], *index_file); primary_key.data_types[j]->deserializeBinary(*loaded_index[j], *index_file);
for (size_t i = 0; i < key_size; ++i) for (size_t i = 0; i < key_size; ++i)
{ {
loaded_index[i]->protect(); loaded_index[i]->protect();
if (loaded_index[i]->size() != index_granularity.getMarksCount()) if (loaded_index[i]->size() != marks_count)
throw Exception("Cannot read all data from index file " + index_path throw Exception("Cannot read all data from index file " + index_path
+ "(expected size: " + toString(index_granularity.getMarksCount()) + ", read: " + toString(loaded_index[i]->size()) + ")", + "(expected size: " + toString(marks_count) + ", read: " + toString(loaded_index[i]->size()) + ")",
ErrorCodes::CANNOT_READ_ALL_DATA); ErrorCodes::CANNOT_READ_ALL_DATA);
} }