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

Reformat all code to coding standard

This commit is contained in:
Andrew Hutchings
2017-10-26 17:18:17 +01:00
parent 4985f3456e
commit 01446d1e22
1296 changed files with 403852 additions and 353747 deletions

View File

@ -41,42 +41,43 @@ namespace joblist
{
Logger::Logger() : fLogId(5),
fImpl(new logging::Logger(5))
fImpl(new logging::Logger(5))
{
MsgMap msgMap;
MsgMap msgMap;
msgMap[LogDefaultMsg] = Message(LogDefaultMsg);
msgMap[LogSQLTrace] = Message(LogSQLTrace);
msgMap[LogNoPrimProcs] = Message(LogNoPrimProcs);
msgMap[LogMakeJobList] = Message(LogMakeJobList);
msgMap[LogRDRequest] = Message(LogRDRequest);
msgMap[LogRDRequestWait] = Message(LogRDRequestWait);
msgMap[LogRDReturn] = Message(LogRDReturn);
msgMap[LogRMResourceChange] = Message(LogRMResourceChange);
msgMap[LogRMResourceChangeError] = Message(LogRMResourceChangeError);
msgMap[LogDefaultMsg] = Message(LogDefaultMsg);
msgMap[LogSQLTrace] = Message(LogSQLTrace);
msgMap[LogNoPrimProcs] = Message(LogNoPrimProcs);
msgMap[LogMakeJobList] = Message(LogMakeJobList);
msgMap[LogRDRequest] = Message(LogRDRequest);
msgMap[LogRDRequestWait] = Message(LogRDRequestWait);
msgMap[LogRDReturn] = Message(LogRDReturn);
msgMap[LogRMResourceChange] = Message(LogRMResourceChange);
msgMap[LogRMResourceChangeError] = Message(LogRMResourceChangeError);
fImpl->msgMap(msgMap);
fImpl->msgMap(msgMap);
}
void catchHandler(const string& ex, int c, SErrorInfo& ei, unsigned sid, logging::LOG_TYPE level)
{
boost::mutex::scoped_lock lk(logMutex);
if (ei->errCode == 0)
{
ei->errMsg = ex;
ei->errCode = c;
}
boost::mutex::scoped_lock lk(logMutex);
Logger log;
log.setLoggingSession(sid);
log.logMessage(level, ex);
if (ei->errCode == 0)
{
ei->errMsg = ex;
ei->errCode = c;
}
Logger log;
log.setLoggingSession(sid);
log.logMessage(level, ex);
}
const string Logger::logMessage(logging::LOG_TYPE logLevel, unsigned idbErrorCode)
{
string errMsg = logging::IDBErrorInfo::instance()->errorMsg(idbErrorCode);
logMessage(logLevel, errMsg);
return errMsg;
string errMsg = logging::IDBErrorInfo::instance()->errorMsg(idbErrorCode);
logMessage(logLevel, errMsg);
return errMsg;
}
}