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

MXS-2300: Fix off-by-one bug in history size

Browse Source 
The history was one command shorter than what was configured.
This commit is contained in:
Markus Mäkelä
2019-01-30 13:01:15 +02:00
parent e5cdefa69d
commit 840b4b24bd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/modules/routing/readwritesplit/rwsplit_route_stmt.cc
View File

@ -517,7 +517,7 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
} }
} }
if (m_config.max_sescmd_history > 0 && m_sescmd_list.size() >= m_config.max_sescmd_history) if (m_config.max_sescmd_history > 0 && m_sescmd_list.size() > m_config.max_sescmd_history)
{ {
static bool warn_history_exceeded = true; static bool warn_history_exceeded = true;
if (warn_history_exceeded) if (warn_history_exceeded)
@ -540,7 +540,7 @@ bool RWSplitSession::route_session_write(GWBUF* querybuf, uint8_t command, uint3
} }
if (m_config.prune_sescmd_history && !m_sescmd_list.empty() if (m_config.prune_sescmd_history && !m_sescmd_list.empty()
&& m_sescmd_list.size() + 1 >= m_config.max_sescmd_history) && m_sescmd_list.size() + 1 > m_config.max_sescmd_history)
{ {
// Close to the history limit, remove the oldest command // Close to the history limit, remove the oldest command
prune_to_position(m_sescmd_list.front()->get_position()); prune_to_position(m_sescmd_list.front()->get_position());