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

MXS-701: Use the default database with query events

Browse Source 
If a query event uses an implicit database, the filtering is now correctly
done also for those tables.
This commit is contained in:
Markus Mäkelä
2018-09-24 11:32:30 +03:00
parent 82b3ffdf60
commit a9155e9f0e
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server/modules/filter/binlogfilter/binlogfiltersession.cc
View File

@ -378,7 +378,7 @@ static bool should_skip(const BinlogConfig& config, const std::string& str)
return skip; return skip;
} }
static bool should_skip_query(const BinlogConfig& config, const std::string& sql) static bool should_skip_query(const BinlogConfig& config, const std::string& sql, const std::string& db = "")
{ {
uint32_t pktlen = sql.size() + 1; // Payload and command byte uint32_t pktlen = sql.size() + 1; // Payload and command byte
GWBUF* buf = gwbuf_alloc(MYSQL_HEADER_LEN + pktlen); GWBUF* buf = gwbuf_alloc(MYSQL_HEADER_LEN + pktlen);
@ -397,7 +397,9 @@ static bool should_skip_query(const BinlogConfig& config, const std::string& sql
for (int i = 0; i < n; i++) for (int i = 0; i < n; i++)
{ {
if (should_skip(config, names[i])) std::string name = strchr(names[i], '.') ? names[i] : db + "." + names[i];
if (should_skip(config, name))
{ {
rval = true; rval = true;
break; break;
@ -774,6 +776,8 @@ void BinlogFilterSession::handleEventData(uint32_t len)
* Note: COMMIT is an exception here, routine returns false * Note: COMMIT is an exception here, routine returns false
* and the called will set m_skip to the right value. * and the called will set m_skip to the right value.
* *
* @see https://mariadb.com/kb/en/library/query_event/
*
* In case of config match the member variable m_skip is set to true. * In case of config match the member variable m_skip is set to true.
* With empty config it returns true and skipping is always false. * With empty config it returns true and skipping is always false.
* *
@ -787,11 +791,11 @@ bool BinlogFilterSession::checkStatement(const uint8_t* event, const uint32_t ev
int db_name_len = event[4 + 4]; int db_name_len = event[4 + 4];
int var_block_len_offset = 4 + 4 + 1 + 2; int var_block_len_offset = 4 + 4 + 1 + 2;
int var_block_len = gw_mysql_get_byte2(event + var_block_len_offset); int var_block_len = gw_mysql_get_byte2(event + var_block_len_offset);
int var_block_end = var_block_len_offset + 2; int static_size = 4 + 4 + 1 + 2 + 2;
int statement_len = event_size - var_block_end - var_block_len - db_name_len - 1 - (m_crc ? 4 : 0); int statement_len = event_size - static_size - var_block_len - db_name_len - 1 - (m_crc ? 4 : 0);
// Set SQL statement, NULL is NOT present in the packet ! std::string db((char*)event + static_size + var_block_len, db_name_len);
std::string sql((char*)event + var_block_end + var_block_len + db_name_len + 1, statement_len); std::string sql((char*)event + static_size + var_block_len + db_name_len + 1, statement_len);
std::string lower_sql; std::string lower_sql;
std::transform(sql.begin(), sql.end(), std::back_inserter(lower_sql), tolower); std::transform(sql.begin(), sql.end(), std::back_inserter(lower_sql), tolower);
@ -800,8 +804,8 @@ bool BinlogFilterSession::checkStatement(const uint8_t* event, const uint32_t ev
return false; return false;
} }
m_skip = should_skip_query(m_filter.getConfig(), sql); m_skip = should_skip_query(m_filter.getConfig(), sql, db);
MXS_INFO("[%s] %s", m_skip ? "SKIP" : " ", sql.c_str()); MXS_INFO("[%s] (%s) %s", m_skip ? "SKIP" : " ", db.c_str(), sql.c_str());
return true; return true;
} }