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

Merge

Browse Source
This commit is contained in:
Michael Kolupaev 2014-04-18 14:37:26 +04:00
parent 30db4e41ec
commit 2ff0b62529
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/include/DB/Storages/MergeTree/MergeTreeData.h
View File

@ -299,8 +299,8 @@ public:
if (!Poco::File(path).exists()) if (!Poco::File(path).exists())
return false; return false;
ReadBufferFromFile file(path, std::min(static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE), Poco::File(path).getSize())); ReadBufferFromFile file(path, std::min(static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE), Poco::File(path).getSize()));
checksums.readText(file); if (checksums.readText(file))
assertEOF(file); assertEOF(file);
return true; return true;
} }
}; };

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

@ -877,7 +877,7 @@ bool MergeTreeData::DataPart::Checksums::readText(ReadBuffer & in)
throw Exception("Bad checksums format version: " + DB::toString(format_version), ErrorCodes::UNKNOWN_FORMAT); throw Exception("Bad checksums format version: " + DB::toString(format_version), ErrorCodes::UNKNOWN_FORMAT);
if (format_version == 1) if (format_version == 1)
return false; return false;
DB::assertString("\n",in); DB::assertString("\n", in);
DB::readText(count, in); DB::readText(count, in);
DB::assertString(" files:\n", in); DB::assertString(" files:\n", in);