database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

add args to lost connection error when getting system data

Browse Source
This commit is contained in:
mariadb-KristinaPavlova
2025-06-30 11:39:40 +03:00
committed by Leonid Fedorov
parent 6831b82515
commit d031239844
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dbcon/execplan/calpontsystemcatalog.cpp
View File

@ -841,10 +841,12 @@ void CalpontSystemCatalog::getSysData(CalpontSelectExecutionPlan& csep, NJLSysDa
} }
} }
if (tryCnt >= 5) if (tryCnt >= 5){
// throw runtime_error("Error occurred when calling system catalog. ExeMgr is not functioning."); // throw runtime_error("Error occurred when calling system catalog. ExeMgr is not functioning.");
Message::Args& args = "Cannot connect to ExeMgr re-connections tries exceeded"; Message::Args args;
args.add("Cannot connect to ExeMgr re-connections tries exceeded");
throw IDBExcept(ERR_SYSTEM_CATALOG, args); throw IDBExcept(ERR_SYSTEM_CATALOG, args);
}
} }
csep.sessionID(fSessionID); csep.sessionID(fSessionID);
@ -910,10 +912,11 @@ void CalpontSystemCatalog::getSysData_EC(CalpontSelectExecutionPlan& csep, NJLSy
{ {
if (status >= 1000) // new error system if (status >= 1000) // new error system
throw IDBExcept(status); throw IDBExcept(status);
else else{
Message::Args args; Message::Args args;
args.add("rowGroup status: ", status); args.add("rowGroup status: " + status);
throw IDBExcept(ERR_SYSTEM_CATALOG, args); throw IDBExcept(ERR_SYSTEM_CATALOG, args);
}
} }
if (rowCount > 0) if (rowCount > 0)
@ -962,7 +965,9 @@ void CalpontSystemCatalog::getSysData_FE(const CalpontSelectExecutionPlan& csep,
if (bs.length() == 0) if (bs.length() == 0)
{ {
throw IDBExcept(ERR_LOST_CONN_EXEMGR); Message::Args args;
args.add("look in error.log on node, having dbroot1");
throw IDBExcept(ERR_LOST_CONN_EXEMGR, args);
} }
string emsgStr; string emsgStr;
@ -993,8 +998,11 @@ void CalpontSystemCatalog::getSysData_FE(const CalpontSelectExecutionPlan& csep,
// @bug 1782. check ExeMgr connection lost // @bug 1782. check ExeMgr connection lost
if (bs.length() == 0) if (bs.length() == 0)
throw IDBExcept(ERR_LOST_CONN_EXEMGR); {
Message::Args args;
args.add("look in error.log on node, having dbroot1");
throw IDBExcept(ERR_LOST_CONN_EXEMGR, args);
}
if (!rowGroup) if (!rowGroup)
{ {
rowGroup.reset(new RowGroup()); rowGroup.reset(new RowGroup());

2
dbcon/mysql/ha_mcs_ddl.cpp
View File

@ -2199,7 +2199,7 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& /*ta
//@Bug 3602. Error message for MySql syntax for autoincrement //@Bug 3602. Error message for MySql syntax for autoincrement
algorithm::to_upper(ddlStatement); algorithm::to_upper(ddlStatement);
std::string errMsg = "The syntax " std::string errMsg = "The syntax ";
if (ddlStatement.find("AUTO_INCREMENT") != string::npos) if (ddlStatement.find("AUTO_INCREMENT") != string::npos)
{ {
errMsg += "auto_increment is not supported in Columnstore."; errMsg += "auto_increment is not supported in Columnstore.";

2
writeengine/shared/we_define.cpp
View File

@ -284,7 +284,7 @@ std::string WErrorCodes::errorString(int code)
case ERR_FILE_DISK_SPACE: case ERR_FILE_DISK_SPACE:
{ {
logging::Message::Args args; logging::Message::Args args;
args.add("configured by WriteEngine.MaxFileSystemDiskUsagePct in columnstore.xml"); args.add("configured by WriteEngine.MaxFileSystemDiskUsagePct in Columnstore.xml");
return logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_EXTENT_DISK_SPACE, args); return logging::IDBErrorInfo::instance()->errorMsg(logging::ERR_EXTENT_DISK_SPACE, args);
break; break;
} }