Adds gtid ignore

Arthur Gautier · Arthur Gautier · commit b722d0699f17 · 2014-09-01T10:55:22.000+02:00
diff --git a/pymysqlreplication/binlogstream.py b/pymysqlreplication/binlogstream.py
@@ -21,15 +21,18 @@ class BinLogStreamReader(object):
 
     def __init__(self, connection_settings={}, resume_stream=False,
                  blocking=False, only_events=None, server_id=255,
-                 log_file=None, log_pos=None, filter_non_implemented_events=True):
+                 log_file=None, log_pos=None, filter_non_implemented_events=True,
+                 ignored_events=[]):
         """
         Attributes:
             resume_stream: Start for event from position or the latest event of
                            binlog or from older available event
             blocking: Read on stream is blocking
             only_events: Array of allowed events
+            ignored_events: Array of ignoreded events
             log_file: Set replication start log file
             log_pos: Set replication start log pos
+            auto_position: Use master_auto_position gtid to set position
         """
         self.__connection_settings = connection_settings
         self.__connection_settings["charset"] = "utf8"
@@ -39,6 +42,7 @@ def __init__(self, connection_settings={}, resume_stream=False,
         self.__resume_stream = resume_stream
         self.__blocking = blocking
         self.__only_events = only_events
+        self.__ignored_events = ignored_events
         self.__filter_non_implemented_events = filter_non_implemented_events
         self.__server_id = server_id
         self.__use_checksum = False
@@ -182,6 +186,10 @@ def __filter_event(self, event):
         if self.__filter_non_implemented_events and isinstance(event, NotImplementedEvent):
             return True
 
+        for ignored_event in self.__ignored_events:
+            if isinstance(event, ignored_event):
+                return True
+
         if self.__only_events is not None:
             for allowed_event in self.__only_events:
                 if isinstance(event, allowed_event):
diff --git a/pymysqlreplication/tests/base.py b/pymysqlreplication/tests/base.py
@@ -15,6 +15,9 @@
     base = unittest.TestCase
 
 class PyMySQLReplicationTestCase(base):
+    def ignoredEvents(self):
+        return []
+
     def setUp(self):
         self.database = {
             "host": "localhost",
@@ -71,4 +74,5 @@ def resetBinLog(self):
         self.execute("RESET MASTER")
         if self.stream is not None:
             self.stream.close()
-        self.stream = BinLogStreamReader(connection_settings=self.database)
+        self.stream = BinLogStreamReader(connection_settings=self.database,
+                                         ignored_events=self.ignoredEvents())
diff --git a/pymysqlreplication/tests/test_basic.py b/pymysqlreplication/tests/test_basic.py
@@ -10,6 +10,9 @@
 
 
 class TestBasicBinLogStreamReader(base.PyMySQLReplicationTestCase):
+    def ignoredEvents(self):
+        return [GtidEvent]
+
     def test_read_query_event(self):
         query = "CREATE TABLE test (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))"
         self.execute(query)
@@ -58,7 +61,8 @@ def test_reading_rotate_event(self):
     def test_connection_stream_lost_event(self):
         self.stream.close()
         self.stream = BinLogStreamReader(connection_settings=self.database,
-                                         blocking=True)
+                                         blocking=True,
+                                         ignored_events=self.ignoredEvents())
 
         query = "CREATE TABLE test (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))"
         self.execute(query)
@@ -202,7 +206,8 @@ def test_log_pos(self):
             connection_settings=self.database,
             resume_stream=True,
             log_file=log_file,
-            log_pos=log_pos
+            log_pos=log_pos,
+            ignored_events=self.ignoredEvents()
         )
 
         self.assertIsInstance(self.stream.fetchone(), RotateEvent)
@@ -243,6 +248,9 @@ def test_log_pos_handles_disconnects(self):
 
 
 class TestMultipleRowBinLogStreamReader(base.PyMySQLReplicationTestCase):
+    def ignoredEvents(self):
+        return [GtidEvent]
+
     def test_insert_multiple_row_event(self):
         query = "CREATE TABLE test (id INT NOT NULL AUTO_INCREMENT, data VARCHAR (50) NOT NULL, PRIMARY KEY (id))"
         self.execute(query)
diff --git a/pymysqlreplication/tests/test_data_objects.py b/pymysqlreplication/tests/test_data_objects.py
@@ -2,13 +2,17 @@
 
 from pymysqlreplication.column import Column
 from pymysqlreplication.table import Table
+from pymysqlreplication.event import GtidEvent
 
 from pymysqlreplication.tests import base
 
 __all__ = ["TestDataObjects"]
 
 
 class TestDataObjects(base.PyMySQLReplicationTestCase):
+    def ignoredEvents(self):
+        return [GtidEvent]
+
     def test_column_is_primary(self):
         col = Column(1,
                      {"COLUMN_NAME": "test",
diff --git a/pymysqlreplication/tests/test_data_type.py b/pymysqlreplication/tests/test_data_type.py
@@ -15,6 +15,9 @@
 
 
 class TestDataType(base.PyMySQLReplicationTestCase):
+    def ignoredEvents(self):
+        return [GtidEvent]
+
     def create_and_insert_value(self, create_query, insert_query):
         self.execute(create_query)
         self.execute(insert_query)
