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

Clean up readwritesplit routing functions

Browse Source 
Moved the more verbose parts of the routing code into subfunctions and
arranged it so that more relevant parts are closer to each other. Also
added the SQL statement that is being delayed to the message.
This commit is contained in:
Markus Mäkelä
2019-03-15 14:01:14 +02:00
parent 2bf55ed675
commit 0001babd26
3 changed files with 82 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
server/modules/routing/readwritesplit/rwsplitsession.hh
View File

@ -168,6 +168,7 @@ private:
bool should_replace_master(mxs::RWBackend* target);
void replace_master(mxs::RWBackend* target);
bool should_migrate_trx(mxs::RWBackend* target);
bool start_trx_migration(mxs::RWBackend* target, GWBUF* querybuf);
void log_master_routing_failure(bool found,
mxs::RWBackend* old_master,
mxs::RWBackend* curr_master);
@ -266,6 +267,34 @@ private:
return buflen == MYSQL_HEADER_LEN + GW_MYSQL_MAX_PACKET_LEN;
}
inline bool can_route_queries() const
{
return m_query_queue == NULL
&& (m_expected_responses == 0
|| m_qc.load_data_state() == mxs::QueryClassifier::LOAD_DATA_ACTIVE
|| m_qc.large_query());
}
inline mxs::QueryClassifier::current_target_t get_current_target() const
{
mxs::QueryClassifier::current_target_t current_target;
if (m_target_node == NULL)
{
current_target = mxs::QueryClassifier::CURRENT_TARGET_UNDEFINED;
}
else if (m_target_node == m_current_master)
{
current_target = mxs::QueryClassifier::CURRENT_TARGET_MASTER;
}
else
{
current_target = mxs::QueryClassifier::CURRENT_TARGET_SLAVE;
}
return current_target;
}
void update_trx_statistics()
{
if (session_trx_is_ending(m_client->session))