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

Cache length of buffered data

Browse Source 
If a complete response is delivered in many buffers, then calling
gwbuf_length() whenever you need the complete size starts to hurt.
By caching the length of the data received sofar and by updating
the length in clientReply(), gwbuf_length() will be called exactly
once for each buffer(chain) delivered to routeQuery().
This commit is contained in:
Johan Wikman 2017-04-07 13:18:05 +03:00
parent 27e97a546d
commit d03b059107
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
server/modules/filter/cache/cachefiltersession.cc vendored
View File

@ -386,21 +386,23 @@ int CacheFilterSession::clientReply(GWBUF* pData)
if (m_res.pData)
{
gwbuf_append(m_res.pData, pData);
m_res.length += gwbuf_length(pData); // pData may be a chain, so not GWBUF_LENGTH().
}
else
{
m_res.pData = pData;
m_res.length = gwbuf_length(pData);
}
if (m_state != CACHE_IGNORING_RESPONSE)
{
if (cache_max_resultset_size_exceeded(m_pCache->config(), gwbuf_length(m_res.pData)))
if (cache_max_resultset_size_exceeded(m_pCache->config(), m_res.length))
{
if (log_decisions())
{
MXS_NOTICE("Current size %uB of resultset, at least as much "
MXS_NOTICE("Current size %luB of resultset, at least as much "
"as maximum allowed size %luKiB. Not caching.",
gwbuf_length(m_res.pData),
m_res.length,
m_pCache->config().max_resultset_size / 1024);
}
@ -466,7 +468,8 @@ int CacheFilterSession::handle_expecting_fields()
bool insufficient = false;
size_t buflen = gwbuf_length(m_res.pData);
size_t buflen = m_res.length;
ss_dassert(m_res.length == gwbuf_length(m_res.pData));
while (!insufficient && (buflen - m_res.offset >= MYSQL_HEADER_LEN))
{
@ -528,7 +531,8 @@ int CacheFilterSession::handle_expecting_response()
int rv = 1;
size_t buflen = gwbuf_length(m_res.pData);
size_t buflen = m_res.length;
ss_dassert(m_res.length == gwbuf_length(m_res.pData));
if (buflen >= MYSQL_HEADER_LEN + 1) // We need the command byte.
{
@ -601,7 +605,8 @@ int CacheFilterSession::handle_expecting_rows()
bool insufficient = false;
size_t buflen = gwbuf_length(m_res.pData);
size_t buflen = m_res.length;
ss_dassert(m_res.length == gwbuf_length(m_res.pData));
while (!insufficient && (buflen - m_res.offset >= MYSQL_HEADER_LEN))
{
@ -661,7 +666,8 @@ int CacheFilterSession::handle_expecting_use_response()
int rv = 1;
size_t buflen = gwbuf_length(m_res.pData);
size_t buflen = m_res.length;
ss_dassert(m_res.length == gwbuf_length(m_res.pData));
if (buflen >= MYSQL_HEADER_LEN + 1) // We need the command byte.
{
@ -733,6 +739,7 @@ int CacheFilterSession::send_upstream()
void CacheFilterSession::reset_response_state()
{
m_res.pData = NULL;
m_res.length = 0;
m_res.nTotalFields = 0;
m_res.nFields = 0;
m_res.nRows = 0;

1
server/modules/filter/cache/cachefiltersession.hh vendored
View File

@ -35,6 +35,7 @@ public:
struct CACHE_RESPONSE_STATE
{
GWBUF* pData; /**< Response data, possibly incomplete. */
size_t length; /**< Length of pData. */
size_t nTotalFields; /**< The number of fields a resultset contains. */
size_t nFields; /**< How many fields we have received, <= n_totalfields. */
size_t nRows; /**< How many rows we have received. */