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

dbms: fixed error [#METR-14902].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-02-03 20:39:24 +03:00
parent 97b0966ce2
commit 60df70053d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -405,8 +405,13 @@ public:
{ {
/// Размер - в количестве засечек. /// Размер - в количестве засечек.
if (!size) if (!size)
{
if (columns.empty())
throw Exception("No columns in part " + name, ErrorCodes::NO_FILE_IN_DATA_PART);
size = Poco::File(storage.full_path + name + "/" + escapeForFileName(columns.front().name) + ".mrk") size = Poco::File(storage.full_path + name + "/" + escapeForFileName(columns.front().name) + ".mrk")
.getSize() / MERGE_TREE_MARK_SIZE; .getSize() / MERGE_TREE_MARK_SIZE;
}
size_t key_size = storage.sort_descr.size(); size_t key_size = storage.sort_descr.size();
index.resize(key_size * size); index.resize(key_size * size);
@ -456,6 +461,9 @@ public:
columns.push_back(column); columns.push_back(column);
} }
if (columns.empty())
throw Exception("No columns in part " + name, ErrorCodes::NO_FILE_IN_DATA_PART);
{ {
WriteBufferFromFile out(path + ".tmp", 4096); WriteBufferFromFile out(path + ".tmp", 4096);
columns.writeText(out); columns.writeText(out);