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

Fix luafilter build failure

Browse Source 
The luafilter used old names.
This commit is contained in:
Markus Mäkelä
2017-01-13 14:36:40 +02:00
parent 7d91872924
commit de07f1d69d
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,15 +53,15 @@
/* /*
* The filter entry points * The filter entry points
*/ */
static FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *); static MXS_FILTER *createInstance(const char *name, char **options, CONFIG_PARAMETER *);
static void *newSession(FILTER *instance, SESSION *session); static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session);
static void closeSession(FILTER *instance, void *session); static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void freeSession(FILTER *instance, void *session); static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session);
static void setDownstream(FILTER *instance, void *fsession, DOWNSTREAM *downstream); static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_DOWNSTREAM *downstream);
static void setUpstream(FILTER *instance, void *fsession, UPSTREAM *upstream); static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, MXS_UPSTREAM *upstream);
static int routeQuery(FILTER *instance, void *fsession, GWBUF *queue); static int32_t routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static int clientReply(FILTER *instance, void *fsession, GWBUF *queue); static int32_t clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, GWBUF *queue);
static void diagnostic(FILTER *instance, void *fsession, DCB *dcb); static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb);
static uint64_t getCapabilities(void); static uint64_t getCapabilities(void);
/** /**
@ -184,8 +184,8 @@ typedef struct
lua_State* lua_state; lua_State* lua_state;
GWBUF* current_query; GWBUF* current_query;
SPINLOCK lock; SPINLOCK lock;
DOWNSTREAM down; MXS_DOWNSTREAM down;
UPSTREAM up; MXS_UPSTREAM up;
} LUA_SESSION; } LUA_SESSION;
/** /**
@ -197,7 +197,7 @@ typedef struct
* @param params Filter parameters * @param params Filter parameters
* @return The instance data for this new instance * @return The instance data for this new instance
*/ */
static FILTER * static MXS_FILTER *
createInstance(const char *name, char **options, CONFIG_PARAMETER *params) createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
{ {
LUA_INSTANCE *my_instance; LUA_INSTANCE *my_instance;
@ -258,7 +258,7 @@ createInstance(const char *name, char **options, CONFIG_PARAMETER *params)
} }
} }
return (FILTER *) my_instance; return (MXS_FILTER *) my_instance;
} }
/** /**
@ -277,7 +277,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 void * newSession(FILTER *instance, SESSION *session) static MXS_FILTER_SESSION *newSession(MXS_FILTER *instance, SESSION *session)
{ {
LUA_SESSION *my_session; LUA_SESSION *my_session;
LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance;
@ -353,7 +353,7 @@ static void * newSession(FILTER *instance, SESSION *session)
spinlock_release(&my_instance->lock); spinlock_release(&my_instance->lock);
} }
return my_session; return (MXS_FILTER_SESSION*)my_session;
} }
/** /**
@ -364,7 +364,7 @@ static void * newSession(FILTER *instance, SESSION *session)
* @param instance The filter instance data * @param instance The filter instance data
* @param session The session being closed * @param session The session being closed
*/ */
static void closeSession(FILTER *instance, void *session) static void closeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE*) instance;
@ -409,7 +409,7 @@ static void closeSession(FILTER *instance, void *session)
* @param instance The filter instance * @param instance The filter instance
* @param session The filter session * @param session The filter session
*/ */
static void freeSession(FILTER *instance, void *session) static void freeSession(MXS_FILTER *instance, MXS_FILTER_SESSION *session)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
@ -429,7 +429,7 @@ static void freeSession(FILTER *instance, void *session)
* @param session The filter session * @param session The filter session
* @param downstream The downstream filter or router. * @param downstream The downstream filter or router.
*/ */
static void setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstream) static void setDownstream(MXS_FILTER *instance, MXS_FILTER_SESSION *session, MXS_DOWNSTREAM *downstream)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
my_session->down = *downstream; my_session->down = *downstream;
@ -441,7 +441,7 @@ static void setDownstream(FILTER *instance, void *session, DOWNSTREAM *downstrea
* @param session Filter session * @param session Filter session
* @param upstream Upstream filter * @param upstream Upstream filter
*/ */
static void setUpstream(FILTER *instance, void *session, UPSTREAM *upstream) static void setUpstream(MXS_FILTER *instance, MXS_FILTER_SESSION *session, MXS_UPSTREAM *upstream)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
my_session->up = *upstream; my_session->up = *upstream;
@ -456,7 +456,7 @@ static void setUpstream(FILTER *instance, void *session, UPSTREAM *upstream)
* @param queue Server response * @param queue Server response
* @return 1 on success * @return 1 on success
*/ */
static int clientReply(FILTER *instance, void *session, GWBUF *queue) static int32_t clientReply(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance;
@ -514,7 +514,7 @@ static int clientReply(FILTER *instance, void *session, GWBUF *queue)
* @param session The filter session * @param session The filter session
* @param queue The query data * @param queue The query data
*/ */
static int routeQuery(FILTER *instance, void *session, GWBUF *queue) static int32_t routeQuery(MXS_FILTER *instance, MXS_FILTER_SESSION *session, GWBUF *queue)
{ {
LUA_SESSION *my_session = (LUA_SESSION *) session; LUA_SESSION *my_session = (LUA_SESSION *) session;
LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance;
@ -621,7 +621,7 @@ static int routeQuery(FILTER *instance, void *session, GWBUF *queue)
* @param fsession Filter session, may be NULL * @param fsession Filter session, may be NULL
* @param dcb The DCB for diagnostic output * @param dcb The DCB for diagnostic output
*/ */
static void diagnostic(FILTER *instance, void *fsession, DCB *dcb) static void diagnostic(MXS_FILTER *instance, MXS_FILTER_SESSION *fsession, DCB *dcb)
{ {
LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance; LUA_INSTANCE *my_instance = (LUA_INSTANCE *) instance;