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

Remove unused buffer types

Browse Source 
A part of the buffer types weren't used or provided no real functionality.
This commit is contained in:
Markus Mäkelä
2017-03-29 07:10:19 +03:00
parent c59ed30da1
commit 5c1c89c835
10 changed files with 14 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
server/core/dcb.cc
View File

@ -1273,67 +1273,13 @@ dcb_write_parameter_check(DCB *dcb, GWBUF *queue)
static void
dcb_log_write_failure(DCB *dcb, GWBUF *queue, int eno)
{
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_DEBUG))
{
if (eno == EPIPE)
{
MXS_DEBUG("%lu [dcb_write] Write to dcb "
"%p in state %s fd %d failed "
"due errno %d, %s",
pthread_self(),
dcb,
STRDCBSTATE(dcb->state),
dcb->fd,
eno,
mxs_strerror(eno));
}
}
if (MXS_LOG_PRIORITY_IS_ENABLED(LOG_ERR))
{
if (eno != EPIPE &&
eno != EAGAIN &&
eno != EWOULDBLOCK)
{
MXS_ERROR("Write to dcb %p in "
"state %s fd %d failed due "
"errno %d, %s",
dcb,
STRDCBSTATE(dcb->state),
dcb->fd,
eno,
mxs_strerror(eno));
}
}
bool dolog = true;
if (eno != 0 &&
eno != EAGAIN &&
if (eno != EPIPE &&
eno != EAGAIN &&
eno != EWOULDBLOCK)
{
/**
* Do not log if writing COM_QUIT to backend failed.
*/
if (GWBUF_IS_TYPE_MYSQL(queue))
{
uint8_t* data = GWBUF_DATA(queue);
MXS_ERROR("Write to dcb %p in state %s fd %d failed: %d, %s",
dcb, STRDCBSTATE(dcb->state), dcb->fd, eno, mxs_strerror(eno));
if (data[4] == 0x01)
{
dolog = false;
}
}
if (dolog)
{
MXS_DEBUG("%lu [dcb_write] Writing to %s socket failed due %d, %s.",
pthread_self(),
DCB_ROLE_CLIENT_HANDLER == dcb->dcb_role ? "client" : "backend server",
eno,
mxs_strerror(eno));
}
}
}

1
server/core/modutil.cc
View File

@ -1004,7 +1004,6 @@ GWBUF* modutil_create_query(const char* query)
*ptr++ = 0x0;
*ptr++ = 0x03;
memcpy(ptr, query, strlen(query));
gwbuf_set_type(rval, GWBUF_TYPE_MYSQL);
}
return rval;