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

MXS-1503: Take EqualPointees<T> into use

Browse Source 
Take the template into use in readwritesplit.
This commit is contained in:
Markus Mäkelä
2018-04-03 13:31:53 +03:00
parent 98fb2cf5ed
commit a15d36b2f0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@
#include <maxscale/router.h> #include <maxscale/router.h>
#include <maxscale/server.h> #include <maxscale/server.h>
#include <maxscale/session_command.hh> #include <maxscale/session_command.hh>
#include <maxscale/utils.hh>
#include "routeinfo.hh" #include "routeinfo.hh"
#include "rwsplit_internal.hh" #include "rwsplit_internal.hh"
@ -280,13 +281,13 @@ static void purge_history(RWSplitSession* rses, mxs::SSessionCommand& sescmd)
if (sescmd->get_command() != MXS_COM_STMT_PREPARE) if (sescmd->get_command() != MXS_COM_STMT_PREPARE)
{ {
auto first = std::find_if(rses->sescmd_list.begin(), rses->sescmd_list.end(), auto first = std::find_if(rses->sescmd_list.begin(), rses->sescmd_list.end(),
mxs::SessionCommand::Equals(sescmd)); mxs::equal_pointees(sescmd));
if (first != rses->sescmd_list.end()) if (first != rses->sescmd_list.end())
{ {
// We have at least one of these commands. See if we have a second one // We have at least one of these commands. See if we have a second one
auto second = std::find_if(std::next(first), rses->sescmd_list.end(), auto second = std::find_if(std::next(first), rses->sescmd_list.end(),
mxs::SessionCommand::Equals(sescmd)); mxs::equal_pointees(sescmd));
if (second != rses->sescmd_list.end()) if (second != rses->sescmd_list.end())
{ {