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

Change SESSION to MXS_SESSION

Browse Source 
Some modules didn't use the new MXS_SESSION structure.
This commit is contained in:
Markus Mäkelä
2017-01-17 21:16:17 +02:00
parent 19b678abfe
commit 5fc7b277da
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/filter/luafilter/luafilter.c
View File

@ -56,7 +56,7 @@
* The filter entry points * The filter entry points
*/ */
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session); static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session); static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session); static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream); static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -182,7 +182,7 @@ typedef struct
*/ */
typedef struct typedef struct
{ {
SESSION* session; MXS_SESSION* session;
lua_State* lua_state; lua_State* lua_state;
GWBUF* current_query; GWBUF* current_query;
SPINLOCK lock; SPINLOCK lock;
@ -279,7 +279,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
* @param session The session itself * @param session The session itself
* @return Session specific data for this session * @return Session specific data for this session
*/ */
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session) static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session)
{ {
LUA_SESSION *my_session; LUA_SESSION *my_session;
LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance;

6
server/modules/filter/mqfilter/mqfilter.c
View File

@ -87,7 +87,7 @@ static int hktask_id = 0;
* The filter entry points * The filter entry points
*/ */
static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session); static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, MXS_SESSION *session);
static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session); static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session); static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream); static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
@ -234,7 +234,7 @@ typedef struct
char* db; /**The currently active database*/ char* db; /**The currently active database*/
MXS_DOWNSTREAM down; MXS_DOWNSTREAM down;
MXS_UPSTREAM up; MXS_UPSTREAM up;
SESSION* session; MXS_SESSION* session;
bool was_query; /**True if the previous routeQuery call had valid content*/ bool was_query; /**True if the previous routeQuery call had valid content*/
} MQ_SESSION; } MQ_SESSION;
@ -803,7 +803,7 @@ void pushMessage(MQ_INSTANCE *instance, amqp_basic_properties_t* prop, char* msg
* @return Session specific data for this session * @return Session specific data for this session
*/ */
static MXS_FILTER_SESSION * static MXS_FILTER_SESSION *
newSession(MXS_FILTER *instance, SESSION *session) newSession(MXS_FILTER *instance, MXS_SESSION *session)
{ {
MYSQL_session *sessauth = session->client_dcb->data; MYSQL_session *sessauth = session->client_dcb->data;
char *db = sessauth->db; char *db = sessauth->db;

4
server/modules/routing/avrorouter/avro.c
View File

@ -72,7 +72,7 @@ static const char* alter_table_regex =
/* The router entry points */ /* The router entry points */
static ROUTER *createInstance(SERVICE *service, char **options); static ROUTER *createInstance(SERVICE *service, char **options);
static void *newSession(ROUTER *instance, SESSION *session); static void *newSession(ROUTER *instance, MXS_SESSION *session);
static void closeSession(ROUTER *instance, void *router_session); static void closeSession(ROUTER *instance, void *router_session);
static void freeSession(ROUTER *instance, void *router_session); static void freeSession(ROUTER *instance, void *router_session);
static int routeQuery(ROUTER *instance, void *router_session, GWBUF *queue); static int routeQuery(ROUTER *instance, void *router_session, GWBUF *queue);
@ -620,7 +620,7 @@ createInstance(SERVICE *service, char **options)
* @return Session specific data for this session * @return Session specific data for this session
*/ */
static void * static void *
newSession(ROUTER *instance, SESSION *session) newSession(ROUTER *instance, MXS_SESSION *session)
{ {
AVRO_INSTANCE *inst = (AVRO_INSTANCE *) instance; AVRO_INSTANCE *inst = (AVRO_INSTANCE *) instance;
AVRO_CLIENT *client; AVRO_CLIENT *client;