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:
Markus Mäkelä
2020-08-28 14:24:16 +03:00
parent bce427f4ad 63a050bd7a
commit caedf79464
5 changed files with 44 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/core/dcb.cc
View File

@ -3256,7 +3256,16 @@ json_t* dcb_to_json(DCB* dcb)
char buf[25];
snprintf(buf, sizeof(buf), "%p", dcb);
json_object_set_new(obj, "id", json_string(buf));
json_object_set_new(obj, "server", json_string(dcb->server->name()));
if (dcb->server)
{
json_object_set_new(obj, "server", json_string(dcb->server->name()));
}
if (dcb->ssl)
{
json_object_set_new(obj, "cipher", json_string(SSL_get_cipher_name(dcb->ssl)));
}
if (dcb->func.diagnostics_json)
{

15
server/core/queryclassifier.cc
View File

@ -1108,6 +1108,21 @@ QueryClassifier::RouteInfo QueryClassifier::update_route_info(
process_routing_hints(pBuffer->hint, &route_target);
if (route_target == TARGET_SLAVE)
{
const QC_FUNCTION_INFO* infos = nullptr;
size_t n_infos = 0;
qc_get_function_info(pBuffer, &infos, &n_infos);
for (size_t i = 0; i < n_infos; ++i)
{
if (strcasecmp(infos[i].name, "FOUND_ROWS") == 0)
{
route_target = TARGET_LAST_USED;
}
}
}
if (session_trx_is_ending(m_pSession)
|| qc_query_is_type(type_mask, QUERY_TYPE_BEGIN_TRX))
{

1
server/core/session.cc
View File

@ -770,6 +770,7 @@ json_t* session_json_data(const Session* session, const char* host, bool rdns)
}
json_object_set_new(attr, "connections", dcb_arr);
json_object_set_new(attr, "client", dcb_to_json(session->client_dcb));
json_t* queries = session->queries_as_json();
json_object_set_new(attr, "queries", queries);