database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-4368 Unified exceptions handling code in dbcon/joblist

Browse Source
This commit is contained in:
Roman Nozdrin
2020-10-19 16:49:52 +00:00
parent 92d861d980
commit cd48df99e5
20 changed files with 296 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
dbcon/joblist/pdictionaryscan.cpp
View File

@ -1,4 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (c) 2016-2020 MariaDB
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@ -426,15 +427,12 @@ void pDictionaryScan::sendPrimitiveMessages()
}
} // end of loop through LBID ranges to be requested from primproc
}//try
catch (const exception& e)
{
catchHandler(e.what(), ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
sendError(ERR_DICTIONARY_SCAN);
}
catch (...)
{
catchHandler("pDictionaryScan caught an unknown exception.",
ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::ERR_DICTIONARY_SCAN,
logging::ERR_ALWAYS_CRITICAL,
"pDictionaryScan::sendPrimitiveMessages()");
sendError(ERR_DICTIONARY_SCAN);
}
@ -547,24 +545,14 @@ void pDictionaryScan::sendAPrimitiveMessage(
{
fDec->write(uniqueID, primMsg);
}
catch (const IDBExcept& e)
{
abort();
cerr << "pDictionaryScan::send() caught: " << e.what() << endl;
catchHandler(e.what(), e.errorCode(), fErrorInfo, fSessionId);
}
catch (const std::exception& e)
{
abort();
cerr << "pDictionaryScan::send() caught: " << e.what() << endl;
catchHandler(e.what(), ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
}
catch (...)
{
abort();
cerr << "pDictionaryScan::send() caught unknown exception" << endl;
catchHandler("pDictionaryScan::send() caught unknown exception",
ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::ERR_DICTIONARY_SCAN,
logging::ERR_ALWAYS_CRITICAL,
"pDictionaryScan::sendAPrimitiveMessage()");
sendError(ERR_DICTIONARY_SCAN);
}
fMsgsToPm++;
@ -757,15 +745,12 @@ void pDictionaryScan::receivePrimitiveMessages()
catchHandler(ex.what(), ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
mutex.unlock();
}
catch (const exception& e)
{
catchHandler(e.what(), ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
mutex.unlock();
}
catch (...)
{
catchHandler("pDictionaryScan caught an unknown exception.",
ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::ERR_DICTIONARY_SCAN,
logging::ERR_ALWAYS_CRITICAL,
"pDictionaryScan::receivePrimitiveMessages()");
mutex.unlock();
}
@ -927,24 +912,13 @@ void pDictionaryScan::serializeEqualityFilter()
{
fDec->write(uniqueID, msg);
}
catch (const IDBExcept& e)
{
abort();
cerr << "pDictionaryScan::serializeEqualityFilter() caught: " << e.what() << endl;
catchHandler(e.what(), e.errorCode(), fErrorInfo, fSessionId);
}
catch (const std::exception& e)
{
abort();
cerr << "pDictionaryScan::serializeEqualityFilter() caught: " << e.what() << endl;
catchHandler(e.what(), ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
}
catch (...)
{
abort();
cerr << "pDictionaryScan::serializeEqualityFilter() caught unknown exception" << endl;
catchHandler("pDictionaryScan::serializeEqualityFilter() caught unknown exception",
ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::ERR_DICTIONARY_SCAN,
logging::ERR_ALWAYS_CRITICAL,
"pDictionaryScan::serializeEqualityFilter()");
}
empty.swap(equalityFilter);
@ -965,23 +939,13 @@ void pDictionaryScan::destroyEqualityFilter()
{
fDec->write(uniqueID, msg);
}
catch (const IDBExcept& e)
{
abort();
catchHandler(e.what(), e.errorCode(), fErrorInfo, fSessionId);
}
catch (const std::exception& e)
{
abort();
cerr << "pDictionaryScan::destroyEqualityFilter() caught: " << e.what() << endl;
catchHandler(e.what(), ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
}
catch (...)
{
abort();
cerr << "pDictionaryScan::destroyEqualityFilter() caught unknown exception" << endl;
catchHandler("pDictionaryScan::destroyEqualityFilter() caught unknown exception",
ERR_DICTIONARY_SCAN, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::ERR_DICTIONARY_SCAN,
logging::ERR_ALWAYS_CRITICAL,
"pDictionaryScan::destroyEqualityFilter()");
}
}