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

MXS-1506: Add router to MXS_DOWNSTREAM helper function

Browse Source 
The function makes it easier to deal with the delayed query routing as
well as removing redundancy in the code.
This commit is contained in:
Markus Mäkelä
2018-04-04 09:18:26 +03:00
parent cc793b2151
commit e5e607908d
3 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/core/session.cc
View File

@ -187,10 +187,7 @@ static MXS_SESSION* session_alloc_body(SERVICE* service, DCB* client_dcb,
// NOTE: the router routeQuery into a filter routeQuery. That
// NOTE: is in order to be able to treat the router as the first
// NOTE: filter.
session->head.instance = (MXS_FILTER*)service->router_instance;
session->head.session = (MXS_FILTER_SESSION*)session->router_session;
session->head.routeQuery =
(int32_t (*)(MXS_FILTER*, MXS_FILTER_SESSION*, GWBUF*))service->router->routeQuery;
session->head = router_as_downstream(session);
// NOTE: Here we cast the session into a MXS_FILTER and MXS_FILTER_SESSION
// NOTE: and session_reply into a filter clientReply. That's dubious but ok
@ -1463,3 +1460,12 @@ bool session_delay_routing(MXS_SESSION* session, MXS_DOWNSTREAM down, GWBUF* buf
return success;
}
MXS_DOWNSTREAM router_as_downstream(MXS_SESSION* session)
{
MXS_DOWNSTREAM head;
head.instance = (MXS_FILTER*)session->service->router_instance;
head.session = (MXS_FILTER_SESSION*)session->router_session;
head.routeQuery = (DOWNSTREAMFUNC)session->service->router->routeQuery;
return head;
}