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

MXS-1625 Hint-handling moved to QueryClassifier

Browse Source
This commit is contained in:
Johan Wikman
2018-04-09 13:05:52 +03:00
parent c8961a3d14
commit 5689613801
5 changed files with 97 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
server/core/queryclassifier.cc
View File

@ -237,7 +237,7 @@ void QueryClassifier::ps_erase(uint32_t id)
return m_sPs_manager->erase(id);
}
uint32_t QueryClassifier::get_route_target(uint8_t command, uint32_t qtype)
uint32_t QueryClassifier::get_route_target(uint8_t command, uint32_t qtype, HINT* pHints)
{
bool trx_active = session_trx_is_active(m_pSession);
uint32_t target = TARGET_UNDEFINED;
@ -363,6 +363,64 @@ uint32_t QueryClassifier::get_route_target(uint8_t command, uint32_t qtype)
target = TARGET_MASTER;
}
/** Process routing hints */
HINT* pHint = pHints;
while (pHint)
{
if (m_pHandler->supports_hint(pHint->type))
{
switch (pHint->type)
{
case HINT_ROUTE_TO_MASTER:
// This means override, so we bail out immediately.
target = TARGET_MASTER;
MXS_DEBUG("Hint: route to master");
pHint = NULL;
break;
case HINT_ROUTE_TO_NAMED_SERVER:
// The router is expected to look up the named server.
target |= TARGET_NAMED_SERVER;
MXS_DEBUG("Hint: route to named server: %s", (char*)pHint->data);
break;
case HINT_ROUTE_TO_UPTODATE_SERVER:
// TODO: Add generic target type, never to be seem by RWS.
ss_dassert(false);
break;
case HINT_ROUTE_TO_ALL:
// TODO: Add generic target type, never to be seem by RWS.
ss_dassert(false);
break;
case HINT_PARAMETER:
if (strncasecmp((char*)pHint->data, "max_slave_replication_lag",
strlen("max_slave_replication_lag")) == 0)
{
target |= TARGET_RLAG_MAX;
}
else
{
MXS_ERROR("Unknown hint parameter '%s' when "
"'max_slave_replication_lag' was expected.",
(char*)pHint->data);
}
break;
case HINT_ROUTE_TO_SLAVE:
target = TARGET_SLAVE;
MXS_DEBUG("Hint: route to slave.");
}
}
if (pHint)
{
pHint = pHint->next;
}
}
return target;
}