1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-04 04:42:30 +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

@ -38,38 +38,40 @@ const unsigned LogEndSql = M0042;
//We can't use a member Logger here. When used with DML and DDL, the syslog gets closed by calls to DMLLog and DDLLog.
SQLLogger::SQLLogger(const std::string sql, unsigned subsys, unsigned session, unsigned txn, unsigned thread)
: fLogId(subsys, session, txn, thread), fLog(!sql.empty())
: fLogId(subsys, session, txn, thread), fLog(!sql.empty())
{
makeMsgMap();
if (fLog) logMessage(LOG_TYPE_DEBUG, sql, LogStartSql);
makeMsgMap();
if (fLog) logMessage(LOG_TYPE_DEBUG, sql, LogStartSql);
}
SQLLogger::SQLLogger(const std::string sql, const LoggingID& logId)
: fLogId(logId.fSubsysID, logId.fSessionID, logId.fTxnID, logId.fThdID), fLog(!sql.empty())
: fLogId(logId.fSubsysID, logId.fSessionID, logId.fTxnID, logId.fThdID), fLog(!sql.empty())
{
makeMsgMap();
if (fLog) logMessage(LOG_TYPE_DEBUG, sql, LogStartSql);
makeMsgMap();
if (fLog) logMessage(LOG_TYPE_DEBUG, sql, LogStartSql);
}
void SQLLogger::makeMsgMap()
{
fMsgMap[LogDefaultMsg] = Message(LogDefaultMsg);
fMsgMap[LogStartSql] = Message(LogStartSql);
fMsgMap[LogEndSql] = Message(LogEndSql);
fMsgMap[LogDefaultMsg] = Message(LogDefaultMsg);
fMsgMap[LogStartSql] = Message(LogStartSql);
fMsgMap[LogEndSql] = Message(LogEndSql);
}
SQLLogger::~SQLLogger()
{
if (fLog) logMessage(LOG_TYPE_DEBUG, "", LogEndSql);
{
if (fLog) logMessage(LOG_TYPE_DEBUG, "", LogEndSql);
}
std::string SQLLogger::logMessage(logging::LOG_TYPE logLevel, const std::string& msg, logging::Message::MessageID mid )
{
logging::Message::Args args;
args.add(msg);
Logger logger(fLogId.fSubsysID);
logger.msgMap(fMsgMap);
return logger.logMessage(logLevel, mid, args, fLogId);
logging::Message::Args args;
args.add(msg);
Logger logger(fLogId.fSubsysID);
logger.msgMap(fMsgMap);
return logger.logMessage(logLevel, mid, args, fLogId);
}
}