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

Clean up backend comparison function

Browse Source 
Renamed and reorganized the function that compares the backend servers.
This commit is contained in:
Markus Mäkelä
2017-06-19 13:02:01 +03:00
parent ae1cdea802
commit aa61c8a30b
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -45,26 +45,22 @@ static SRWBackend get_root_master_bref(ROUTER_CLIENT_SES *rses);
* value in selection criteria. If either reference pointer is NULL then the * value in selection criteria. If either reference pointer is NULL then the
* other reference pointer value is returned. * other reference pointer value is returned.
*/ */
static SRWBackend& check_candidate_bref(SRWBackend& cand, static SRWBackend compare_backends(SRWBackend a, SRWBackend b, select_criteria_t sc)
SRWBackend& new_bref,
select_criteria_t sc)
{ {
int (*p)(const void *, const void *); int (*p)(const void *, const void *);
/** get compare function */ /** get compare function */
p = criteria_cmpfun[sc]; p = criteria_cmpfun[sc];
if (new_bref == NULL) if (!a)
{ {
return cand; return b;
} }
else if (cand == NULL || (p((void *)&cand, (void *)&new_bref) > 0)) else if (!b)
{ {
return new_bref; return a;
}
else
{
return cand;
} }
return p((void *)&a, (void *)&b) > 0 ? b : a;
} }
void handle_connection_keepalive(ROUTER_INSTANCE *inst, ROUTER_CLIENT_SES *rses, void handle_connection_keepalive(ROUTER_INSTANCE *inst, ROUTER_CLIENT_SES *rses,