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

Make COMMIT/ROLLBACK a part of the transaction

Browse Source 
The transaction tracking now flags the transaction as open even when a
COMMIT/ROLLBACK is received. The next statement after the transaction is
closed resets the transaction state to inactive. This means that the end
of the transaction belongs in the transaction.

This allows all statements that belong to a transaction to be detected
with the transaction tracking functions provided by the core. With this,
the routing modules should have an easier time handling transactions.
This commit is contained in:
Markus Mäkelä
2017-01-24 14:28:09 +02:00
parent c77bb502e9
commit 99f6d4678d
2 changed files with 4 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
include/maxscale/session.h
View File

@ -66,9 +66,9 @@ typedef enum
/*< An explicit READ WRITE transaction is active. */ /*< An explicit READ WRITE transaction is active. */
SESSION_TRX_READ_WRITE = (SESSION_TRX_ACTIVE_BIT | SESSION_TRX_READ_WRITE_BIT), SESSION_TRX_READ_WRITE = (SESSION_TRX_ACTIVE_BIT | SESSION_TRX_READ_WRITE_BIT),
/*< An explicit READ ONLY transaction is ending. */ /*< An explicit READ ONLY transaction is ending. */
SESSION_TRX_READ_ONLY_ENDING = (SESSION_TRX_ENDING_BIT | SESSION_TRX_READ_ONLY_BIT), SESSION_TRX_READ_ONLY_ENDING = (SESSION_TRX_ENDING_BIT | SESSION_TRX_READ_ONLY),
/*< An explicit READ WRITE transaction is ending. */ /*< An explicit READ WRITE transaction is ending. */
SESSION_TRX_READ_WRITE_ENDING = (SESSION_TRX_ENDING_BIT | SESSION_TRX_READ_WRITE_BIT), SESSION_TRX_READ_WRITE_ENDING = (SESSION_TRX_ENDING_BIT | SESSION_TRX_READ_WRITE),
} mxs_session_trx_state_t; } mxs_session_trx_state_t;
/** /**
@ -231,7 +231,7 @@ mxs_session_trx_state_t session_set_trx_state(MXS_SESSION* ses, mxs_session_trx_
*/ */
static inline bool session_trx_is_read_only(const MXS_SESSION* ses) static inline bool session_trx_is_read_only(const MXS_SESSION* ses)
{ {
return ses->trx_state == SESSION_TRX_READ_ONLY; return ses->trx_state == SESSION_TRX_READ_ONLY || ses->trx_state == SESSION_TRX_READ_ONLY_ENDING;
} }
/** /**
@ -247,7 +247,7 @@ static inline bool session_trx_is_read_only(const MXS_SESSION* ses)
*/ */
static inline bool session_trx_is_read_write(const MXS_SESSION* ses) static inline bool session_trx_is_read_write(const MXS_SESSION* ses)
{ {
return ses->trx_state == SESSION_TRX_READ_WRITE; return ses->trx_state == SESSION_TRX_READ_WRITE || ses->trx_state == SESSION_TRX_READ_WRITE_ENDING;
} }
/** /**
@ -265,38 +265,6 @@ static inline bool session_trx_is_ending(const MXS_SESSION* ses)
return ses->trx_state & SESSION_TRX_ENDING_BIT; return ses->trx_state & SESSION_TRX_ENDING_BIT;
} }
/**
* Tells whether a read-only transaction is ending.
*
* @see session_get_trx_state
*
* @note The return value is valid only if either a router or a filter
* has declared that it needs RCAP_TYPE_TRANSACTION_TRACKING.
*
* @return True if a transaction that was active is ending either via COMMIT or
* ROLLBACK and it was a read-only transaction.
*/
static inline bool session_read_only_trx_is_ending(const MXS_SESSION* ses)
{
return ses->trx_state == SESSION_TRX_READ_ONLY_ENDING;
}
/**
* Tells whether a read-write transaction is ending.
*
* @see session_get_trx_state
*
* @note The return value is valid only if either a router or a filter
* has declared that it needs RCAP_TYPE_TRANSACTION_TRACKING.
*
* @return True if a transaction that was active is ending either via COMMIT or
* ROLLBACK and it was a read-write transaction.
*/
static inline bool session_read_write_trx_is_ending(const MXS_SESSION* ses)
{
return ses->trx_state == SESSION_TRX_READ_WRITE_ENDING;
}
/** /**
* Tells whether autocommit is ON or not. * Tells whether autocommit is ON or not.
* *

5
server/modules/protocol/MySQL/MySQLClient/mysql_client.c
View File

@ -1521,12 +1521,7 @@ static int route_by_statement(MXS_SESSION* session, uint64_t capabilities, GWBUF
else if ((type & QUERY_TYPE_COMMIT) || (type & QUERY_TYPE_ROLLBACK)) else if ((type & QUERY_TYPE_COMMIT) || (type & QUERY_TYPE_ROLLBACK))
{ {
mxs_session_trx_state_t trx_state = session_get_trx_state(session); mxs_session_trx_state_t trx_state = session_get_trx_state(session);
/** Remove the active transaction bit and set the end
* of transaction bit */
trx_state &= ~SESSION_TRX_ACTIVE_BIT;
trx_state |= SESSION_TRX_ENDING_BIT; trx_state |= SESSION_TRX_ENDING_BIT;
session_set_trx_state(session, trx_state); session_set_trx_state(session, trx_state);
if (type & QUERY_TYPE_ENABLE_AUTOCOMMIT) if (type & QUERY_TYPE_ENABLE_AUTOCOMMIT)