Rename readwritesplit router session class

Renamed the struct to RWSplitSession and removed the obsole next pointer.
This commit is contained in:
Markus Mäkelä
2017-06-25 15:35:52 +03:00
parent 917fe21f72
commit 013b081b9e
8 changed files with 99 additions and 95 deletions

View File

@ -54,7 +54,7 @@ static bool valid_for_slave(const SERVER *server, const SERVER *master)
*
* @return The best slave backend reference or NULL if no candidates could be found
*/
SRWBackend get_slave_candidate(ROUTER_CLIENT_SES* rses, const SERVER *master,
SRWBackend get_slave_candidate(RWSplitSession* rses, const SERVER *master,
int (*cmpfun)(const SRWBackend&, const SRWBackend&))
{
SRWBackend candidate;
@ -198,7 +198,7 @@ int (*criteria_cmpfun[LAST_CRITERIA])(const SRWBackend&, const SRWBackend&) =
* @param rses Router client session
*/
static void log_server_connections(select_criteria_t criteria,
ROUTER_CLIENT_SES* rses)
RWSplitSession* rses)
{
MXS_INFO("Servers and %s connection counts:",
criteria == LEAST_GLOBAL_CONNECTIONS ? "all MaxScale" : "router");
@ -246,7 +246,7 @@ static void log_server_connections(select_criteria_t criteria,
*
* @return The root master reference or NULL if no master is found
*/
static SERVER_REF* get_root_master(ROUTER_CLIENT_SES* rses)
static SERVER_REF* get_root_master(RWSplitSession* rses)
{
SERVER_REF *master_host = NULL;
@ -291,7 +291,7 @@ bool select_connect_backend_servers(int router_nservers,
select_criteria_t select_criteria,
MXS_SESSION *session,
RWSplit *router,
ROUTER_CLIENT_SES *rses,
RWSplitSession *rses,
connection_type type)
{
/* get the root Master */