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

MXS-1625 Remove duplicate function

Browse Source 
Correct test in remaining function.
This commit is contained in:
Johan Wikman
2018-04-11 14:45:19 +03:00
parent 77a258de86
commit 7d97bf76ea
2 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/modules/routing/readwritesplit/rwsplitsession.cc
View File

@ -720,7 +720,7 @@ bool RWSplitSession::lock_to_master()
bool RWSplitSession::is_locked_to_master() const bool RWSplitSession::is_locked_to_master() const
{ {
return m_target_node && m_target_node == m_current_master; return m_current_master && m_target_node == m_current_master;
} }
bool RWSplitSession::supports_hint(HINT_TYPE hint_type) const bool RWSplitSession::supports_hint(HINT_TYPE hint_type) const

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

@ -180,16 +180,6 @@ private:
void handle_error_reply_client(DCB *backend_dcb, GWBUF *errmsg); void handle_error_reply_client(DCB *backend_dcb, GWBUF *errmsg);
bool handle_error_new_connection(DCB *backend_dcb, GWBUF *errmsg); bool handle_error_new_connection(DCB *backend_dcb, GWBUF *errmsg);
/**
* Check if the session is locked to the master
*
* @return Whether the session is locked to the master
*/
inline bool locked_to_master() const
{
return m_qc.large_query() || (m_current_master && m_target_node == m_current_master);
}
private: private:
// QueryClassifier::Handler // QueryClassifier::Handler
bool lock_to_master(); bool lock_to_master();