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

MXS-1625 Remove final traces of RWSplitSession

Browse Source 
The code for figuring out the where to send a statement does no
longer depend upon RWSplitSession but only on QueryClassifier.
So now the functionality can be moved into QueryClassifier after
which further cleanup and streamlining can be done.
This commit is contained in:
Johan Wikman
2018-04-06 15:27:47 +03:00
parent 300de4ecc6
commit a102ddf5de
4 changed files with 95 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/maxscale/queryclassifier.hh
View File

@ -29,6 +29,13 @@ class QueryClassifier
QueryClassifier& operator = (const QueryClassifier&) = delete;
public:
class Handler
{
public:
virtual bool lock_to_master() = 0;
virtual bool is_locked_to_master() const = 0;
};
typedef std::tr1::unordered_set<std::string> TableSet;
// NOTE: For the time being these must be exactly like the ones in readwritesplit.hh
@ -59,6 +66,16 @@ public:
QueryClassifier(MXS_SESSION* pSession,
mxs_target_t use_sql_variables_in);
void set_handler(Handler* pHandler) // TODO: Eventually to be set in constructor
{
m_pHandler = pHandler;
}
Handler* handler() const
{
return m_pHandler;
}
bool multi_statements_allowed() const
{
return m_multi_statements_allowed;
@ -188,6 +205,7 @@ private:
typedef std::tr1::unordered_map<uint32_t, uint32_t> HandleMap;
private:
Handler* m_pHandler;
MXS_SESSION* m_pSession;
mxs_target_t m_use_sql_variables_in;
load_data_state_t m_load_data_state; /**< The LOAD DATA state */