DBZ-2275 Updated default database history DML filter default to handle additional RDS statements;

* Added two more regular expressions to the default database history DML filter. These are intended to catch and filter out `INSERT into mysql.rds_monitor…` statements that RDS may write in the binlog
* Added a new unit test that checks that the regular expressions do catch some example statements
This commit is contained in:
Randall Hauch 2020-06-25 13:57:49 -05:00 committed by GitHub
parent fd3804c01b
commit 5860812a63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 0 deletions

View File

@ -119,6 +119,25 @@ public void shouldCreateTaskFromConfigurationWithWhenNeededSnapshotMode() throws
assertThat(context.isSnapshotNeverAllowed()).isEqualTo(false);
}
@Test
public void shouldFilterInternalDmlStatementsUsingDefaultFilter() throws Exception {
config = simpleConfig().build();
context = new MySqlTaskContext(config, new Filters.Builder(config).build(), false, null);
assertThat(context.ddlFilter().test("INSERT INTO mysql.rds_heartbeat2(name) values ('innodb_txn_key') ON DUPLICATE KEY UPDATE value = 'v'")).isTrue();
assertThat(context.ddlFilter().test("INSERT INTO mysql.rds_sysinfo(name, value) values ('innodb_txn_key','Sat Jun 13 06:26:02 UTC 2020')")).isTrue();
assertThat(context.ddlFilter().test("INSERT INTO mysql.rds_monitor(name, value) values ('innodb_txn_key','Sat Jun 13 06:26:02 UTC 2020')")).isTrue();
assertThat(context.ddlFilter().test("INSERT INTO mysql.rds_monitor(name) values ('innodb_txn_key') ON DUPLICATE KEY UPDATE value = 'v'")).isTrue();
assertThat(context.ddlFilter().test("DELETE FROM mysql.rds_sysinfo")).isTrue();
assertThat(context.ddlFilter().test("DELETE FROM mysql.rds_monitor;")).isTrue();
assertThat(context.ddlFilter().test("FLUSH RELAY LOGS;")).isTrue();
assertThat(context.ddlFilter().test("SAVEPOINT x")).isTrue();
// Missing 'ON DUPLICATE ...' clause
assertThat(context.ddlFilter().test("INSERT INTO mysql.rds_heartbeat2(name) values ('innodb_txn_key')")).isFalse();
// No space after 'SAVEPOINT'
assertThat(context.ddlFilter().test("SAVEPOINT;")).isFalse();
}
@Test
public void shouldUseGtidSetIncludes() throws Exception {
config = simpleConfig().with(MySqlConnectorConfig.GTID_SOURCE_INCLUDES, "a,b,c,d.*")

View File

@ -64,6 +64,8 @@ public interface DatabaseHistory {
"INSERT INTO mysql.rds_heartbeat2\\(.*\\) values \\(.*\\) ON DUPLICATE KEY UPDATE value = .*," +
"DELETE FROM mysql.rds_sysinfo.*," +
"INSERT INTO mysql.rds_sysinfo\\(.*\\) values \\(.*\\)," +
"INSERT INTO mysql.rds_monitor\\(.*\\) values \\(.*\\) ON DUPLICATE KEY UPDATE value = .*," +
"INSERT INTO mysql.rds_monitor\\(.*\\) values \\(.*\\)," +
"DELETE FROM mysql.rds_monitor.*," +
"FLUSH RELAY LOGS.*," +
"flush relay logs.*," +