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

MXS-2196: Remove redundant DCB member variables

Browse Source 
The variables held duplicate information already present in other parts of
the system.
This commit is contained in:
Markus Mäkelä
2018-11-30 17:17:34 +02:00
parent 694d4a4003
commit 7a87ff9ce1
6 changed files with 32 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/core/server.cc
View File

@ -265,14 +265,12 @@ DCB* server_get_persistent(SERVER* server, const char* user, const char* ip, con
while (dcb)
{
if (dcb->user
&& dcb->protoname
&& dcb->remote
&& ip
&& !dcb->dcb_errhandle_called
&& !(dcb->flags & DCBF_HUNG)
&& 0 == strcmp(dcb->user, user)
&& 0 == strcmp(dcb->remote, ip)
&& 0 == strcmp(dcb->protoname, protocol))
&& 0 == strcmp(dcb->listener->protocol(), protocol))
{
if (NULL == previous)
{
@ -288,20 +286,7 @@ DCB* server_get_persistent(SERVER* server, const char* user, const char* ip, con
mxb::atomic::add(&server->stats.n_current, 1, mxb::atomic::RELAXED);
return dcb;
}
else
{
MXS_DEBUG("%lu [server_get_persistent] Rejected dcb "
"%p from pool, user %s looking for %s, protocol %s "
"looking for %s, hung flag %s, error handle called %s.",
pthread_self(),
dcb,
dcb->user ? dcb->user : "NULL",
user,
dcb->protoname ? dcb->protoname : "NULL",
protocol,
(dcb->flags & DCBF_HUNG) ? "true" : "false",
dcb->dcb_errhandle_called ? "true" : "false");
}
previous = dcb;
dcb = dcb->nextpersistent;
}