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

Merge branch '2.3' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2019-04-15 15:13:50 +03:00
parent 533d5b522b bd54efbb3f
commit 21b4cc3944
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/modules/protocol/MySQL/rwbackend.cc
View File

@ -16,6 +16,8 @@
#include <maxscale/modutil.hh> #include <maxscale/modutil.hh>
#include <maxscale/protocol/mysql.hh> #include <maxscale/protocol/mysql.hh>
using Iter = mxs::Buffer::iterator;
namespace maxscale namespace maxscale
{ {
@ -153,7 +155,6 @@ static inline bool have_next_packet(GWBUF* buffer)
return gwbuf_length(buffer) > len; return gwbuf_length(buffer) > len;
} }
template<class Iter>
uint64_t get_encoded_int(Iter it) uint64_t get_encoded_int(Iter it)
{ {
uint64_t len = *it++; uint64_t len = *it++;
@ -189,27 +190,31 @@ uint64_t get_encoded_int(Iter it)
return len; return len;
} }
template<class Iter>
Iter skip_encoded_int(Iter it) Iter skip_encoded_int(Iter it)
{ {
switch (*it) switch (*it)
{ {
case 0xfc: case 0xfc:
return std::next(it, 3); std::advance(it, 3);
break;
case 0xfd: case 0xfd:
return std::next(it, 4); std::advance(it, 4);
break;
case 0xfe: case 0xfe:
return std::next(it, 9); std::advance(it, 9);
break;
default: default:
return std::next(it); std::advance(it, 1);
break;
} }
return it;
} }
template<class Iter> bool is_last_ok(Iter it)
uint64_t is_last_ok(Iter it)
{ {
++it; // Skip the command byte ++it; // Skip the command byte
it = skip_encoded_int(it); // Affected rows it = skip_encoded_int(it); // Affected rows
@ -219,8 +224,7 @@ uint64_t is_last_ok(Iter it)
return (status & SERVER_MORE_RESULTS_EXIST) == 0; return (status & SERVER_MORE_RESULTS_EXIST) == 0;
} }
template<class Iter> bool is_last_eof(Iter it)
uint64_t is_last_eof(Iter it)
{ {
std::advance(it, 3); // Skip the command byte and warning count std::advance(it, 3); // Skip the command byte and warning count
uint16_t status = *it++; uint16_t status = *it++;
@ -228,7 +232,7 @@ uint64_t is_last_eof(Iter it)
return (status & SERVER_MORE_RESULTS_EXIST) == 0; return (status & SERVER_MORE_RESULTS_EXIST) == 0;
} }
void RWBackend::process_reply_start(mxs::Buffer::iterator it) void RWBackend::process_reply_start(Iter it)
{ {
uint8_t cmd = *it; uint8_t cmd = *it;
m_local_infile_requested = false; m_local_infile_requested = false;
@ -299,8 +303,8 @@ void RWBackend::process_packets(GWBUF* result)
case REPLY_STATE_DONE: case REPLY_STATE_DONE:
// This should never happen // This should never happen
mxb_assert(!true);
MXS_ERROR("Unexpected result state. cmd: 0x%02hhx, len: %u", cmd, len); MXS_ERROR("Unexpected result state. cmd: 0x%02hhx, len: %u", cmd, len);
mxb_assert(!true);
break; break;
case REPLY_STATE_RSET_COLDEF: case REPLY_STATE_RSET_COLDEF: