hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Johan Wikman
2020-08-20 14:29:16 +03:00
parent 02b0a4c52c 606ae6d2b0
commit c0cd751215
5 changed files with 71 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/gateway.cc
View File

@ -426,6 +426,17 @@ static void sigfatal_handler(int i)
"Commit ID: %s System name: %s Release string: %s",
MAXSCALE_VERSION, i, maxscale_commit, cnf->sysname, cnf->release_string);
const char* pStmt;
size_t nStmt;
if (!qc_get_current_stmt(&pStmt, &nStmt))
{
pStmt = "none/unknown";
nStmt = strlen(pStmt);
}
MXS_ALERT("Statement currently being classified: %.*s", (int)nStmt, pStmt);
if (DCB* dcb = dcb_get_current())
{
if (dcb->session)

8
server/core/query_classifier.cc
View File

@ -1350,6 +1350,14 @@ bool qc_set_options(uint32_t options)
return rv == QC_RESULT_OK;
}
bool qc_get_current_stmt(const char** ppStmt, size_t* pLen)
{
QC_TRACE();
mxb_assert(this_unit.classifier);
return this_unit.classifier->qc_get_current_stmt(ppStmt, pLen) == QC_RESULT_OK;
}
void qc_get_cache_properties(QC_CACHE_PROPERTIES* properties)
{
properties->max_size = this_unit.cache_max_size();