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

dbms: development [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2012-07-31 17:33:08 +00:00
parent 5e1e2742b6
commit db924e76d0
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/include/DB/Storages/StorageMergeTree.h
View File

@ -225,7 +225,6 @@ private:
void mergeImpl(DataParts::iterator left, DataParts::iterator right); void mergeImpl(DataParts::iterator left, DataParts::iterator right);
boost::thread merge_thread; boost::thread merge_thread;
ExceptionPtr merge_exception;
}; };
} }

7
dbms/src/Storages/StorageMergeTree.cpp
View File

@ -1013,9 +1013,6 @@ bool StorageMergeTree::merge()
if (merge_thread.joinable()) if (merge_thread.joinable())
merge_thread.join(); merge_thread.join();
if (merge_exception)
merge_exception->rethrow();
if (selectPartsToMerge(left, right)) if (selectPartsToMerge(left, right))
{ {
merge_thread = boost::thread(boost::bind(&StorageMergeTree::mergeImpl, this, left, right)); merge_thread = boost::thread(boost::bind(&StorageMergeTree::mergeImpl, this, left, right));
@ -1194,7 +1191,6 @@ void StorageMergeTree::mergeImpl(DataParts::iterator left, DataParts::iterator r
} }
catch (const Exception & e) catch (const Exception & e)
{ {
merge_exception = e.clone();
LOG_ERROR(log, "Code: " << e.code() << ". " << e.displayText() << std::endl LOG_ERROR(log, "Code: " << e.code() << ". " << e.displayText() << std::endl
<< std::endl << std::endl
<< "Stack trace:" << std::endl << "Stack trace:" << std::endl
@ -1202,17 +1198,14 @@ void StorageMergeTree::mergeImpl(DataParts::iterator left, DataParts::iterator r
} }
catch (const Poco::Exception & e) catch (const Poco::Exception & e)
{ {
merge_exception = e.clone();
LOG_ERROR(log, "Poco::Exception: " << e.code() << ". " << e.displayText()); LOG_ERROR(log, "Poco::Exception: " << e.code() << ". " << e.displayText());
} }
catch (const std::exception & e) catch (const std::exception & e)
{ {
merge_exception = new Exception(e.what(), ErrorCodes::STD_EXCEPTION);
LOG_ERROR(log, "std::exception: " << e.what()); LOG_ERROR(log, "std::exception: " << e.what());
} }
catch (...) catch (...)
{ {
merge_exception = new Exception("Unknown exception", ErrorCodes::UNKNOWN_EXCEPTION);
LOG_ERROR(log, "Unknown exception"); LOG_ERROR(log, "Unknown exception");
} }
} }