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

73
server/modules/routing/readwritesplit/routeinfo.cc
View File

@ -23,77 +23,6 @@ using mxs::QueryClassifier;
namespace
{
/**
* Examine the query type, transaction state and routing hints. Find out the
* target for query routing.
*
* @param qc The query classifier.
* @param command The current command.
* @param qtype Type of query
* @param query_hints Pointer to list of hints attached to the query buffer
*
* @return bitfield including the routing target, or the target server name
* if the query would otherwise be routed to slave.
*/
route_target_t get_route_target(mxs::QueryClassifier& qc,
uint8_t command,
uint32_t qtype,
HINT *query_hints)
{
int target = qc.get_route_target(command, qtype);
/** Process routing hints */
for (HINT* hint = query_hints; hint; hint = hint->next)
{
if (hint->type == HINT_ROUTE_TO_MASTER)
{
target = TARGET_MASTER; /*< override */
MXS_DEBUG("Hint: route to master");
break;
}
else if (hint->type == HINT_ROUTE_TO_NAMED_SERVER)
{
/**
* Searching for a named server. If it can't be
* found, the oroginal target is chosen.
*/
target |= TARGET_NAMED_SERVER;
MXS_DEBUG("Hint: route to named server: %s", (char*)hint->data);
}
else if (hint->type == HINT_ROUTE_TO_UPTODATE_SERVER)
{
/** not implemented */
ss_dassert(false);
}
else if (hint->type == HINT_ROUTE_TO_ALL)
{
/** not implemented */
ss_dassert(false);
}
else if (hint->type == HINT_PARAMETER)
{
if (strncasecmp((char*)hint->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*)hint->data);
}
}
else if (hint->type == HINT_ROUTE_TO_SLAVE)
{
target = TARGET_SLAVE;
MXS_DEBUG("Hint: route to slave.");
}
}
return (route_target_t)target;
}
/**
* @brief Log the transaction status
*
@ -608,7 +537,7 @@ route_target_t get_target_type(QueryClassifier& qc,
*type = qc.ps_get_type(*stmt_id);
}
route_target = get_route_target(qc, *command, *type, buffer->hint);
route_target = static_cast<route_target_t>(qc.get_route_target(*command, *type, buffer->hint));
}
}
else

26
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -755,3 +755,29 @@ bool RWSplitSession::is_locked_to_master() const
{
return m_target_node && m_target_node == m_current_master;
}
bool RWSplitSession::supports_hint(HINT_TYPE hint_type) const
{
bool rv = true;
switch (hint_type)
{
case HINT_ROUTE_TO_MASTER:
case HINT_ROUTE_TO_SLAVE:
case HINT_ROUTE_TO_NAMED_SERVER:
case HINT_PARAMETER:
break;
case HINT_ROUTE_TO_UPTODATE_SERVER:
case HINT_ROUTE_TO_ALL:
ss_dassert(!true);
rv = false;
break;
default:
ss_dassert(!true);
rv = false;
}
return rv;
}

1
server/modules/routing/readwritesplit/rwsplitsession.hh
View File

@ -182,6 +182,7 @@ private:
// QueryClassifier::Handler
bool lock_to_master();
bool is_locked_to_master() const;
bool supports_hint(HINT_TYPE hint_type) const;
};
/**