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

43
dbcon/joblist/tupleconstantstep.cpp
View File

@ -360,20 +360,12 @@ uint32_t TupleConstantStep::nextBand(messageqcpp::ByteStream& bs)
fEndOfResult = true;
}
}
catch (const std::exception& ex)
{
catchHandler(ex.what(), tupleConstantStepErr, fErrorInfo, fSessionId);
while (more)
more = fInputDL->next(fInputIterator, &rgDataIn);
fEndOfResult = true;
}
catch (...)
{
catchHandler("TupleConstantStep next band caught an unknown exception",
tupleConstantStepErr, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::tupleConstantStepErr,
logging::ERR_ALWAYS_CRITICAL,
"TupleConstantStep::nextBand()");
while (more)
more = fInputDL->next(fInputIterator, &rgDataIn);
@ -445,17 +437,14 @@ void TupleConstantStep::execute()
}
}
}
catch (const std::exception& ex)
{
catchHandler(ex.what(), tupleConstantStepErr, fErrorInfo, fSessionId);
}
catch (...)
{
catchHandler("TupleConstantStep execute caught an unknown exception",
tupleConstantStepErr, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::tupleConstantStepErr,
logging::ERR_ALWAYS_CRITICAL,
"TupleConstantStep::execute()");
}
// if (!fEndOfResult)
while (more)
more = fInputDL->next(fInputIterator, &rgDataIn);
@ -717,8 +706,10 @@ void TupleConstantOnlyStep::run()
}
catch (...)
{
catchHandler("TupleConstantOnlyStep run caught an unknown exception",
tupleConstantStepErr, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::tupleConstantStepErr,
logging::ERR_ALWAYS_CRITICAL,
"TupleConstantOnlyStep::run()");
}
if (traceOn())
@ -756,14 +747,12 @@ uint32_t TupleConstantOnlyStep::nextBand(messageqcpp::ByteStream& bs)
fRowGroupOut.serializeRGData(bs);
rowCount = fRowGroupOut.getRowCount();
}
catch (const std::exception& ex)
{
catchHandler(ex.what(), tupleConstantStepErr, fErrorInfo, fSessionId);
}
catch (...)
{
catchHandler("TupleConstantStep next band caught an unknown exception",
tupleConstantStepErr, fErrorInfo, fSessionId);
handleException(std::current_exception(),
logging::tupleConstantStepErr,
logging::ERR_ALWAYS_CRITICAL,
"TupleConstantOnlyStep::nextBand()");
}
fEndOfResult = true;