Typo: PreviousGtidsEvent

Author: suhwan-cheon

pymysqlreplication/binlogstream.py

@@ -15,7 +15,7 @@
     XidEvent, GtidEvent, StopEvent, XAPrepareEvent,
     BeginLoadQueryEvent, ExecuteLoadQueryEvent,
     HeartbeatLogEvent, NotImplementedEvent, MariadbGtidEvent,
-    PreviousGtidEvent)
+    PreviousGtidsEvent)
 from .exceptions import BinLogNotEnabled
 from .row_event import (
     UpdateRowsEvent, WriteRowsEvent, DeleteRowsEvent, TableMapEvent)
@@ -602,7 +602,7 @@ def _allowed_event_list(self, only_events, ignored_events,
                 HeartbeatLogEvent,
                 NotImplementedEvent,
                 MariadbGtidEvent,
-                PreviousGtidEvent
+                PreviousGtidsEvent
                 ))
         if ignored_events is not None:
             for e in ignored_events:

pymysqlreplication/event.py

@@ -90,7 +90,7 @@ def __repr__(self):
         return '<GtidEvent "%s">' % self.gtid
 
 
-class PreviousGtidEvent(BinLogEvent):
+class PreviousGtidsEvent(BinLogEvent):
     """
     PreviousGtidEvent is contains the Gtids executed in the last binary log file.
     Attributes:
@@ -100,7 +100,7 @@ class PreviousGtidEvent(BinLogEvent):
     Eg: [4c9e3dfc-9d25-11e9-8d2e-0242ac1cfd7e:1-100, 4c9e3dfc-9d25-11e9-8d2e-0242ac1cfd7e:1-10:20-30]
     """
     def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs):
-        super(PreviousGtidEvent, self).__init__(from_packet, event_size, table_map,
+        super(PreviousGtidsEvent, self).__init__(from_packet, event_size, table_map,
                                                 ctl_connection, **kwargs)
 
         self._n_sid = self.packet.read_int64()
@@ -121,7 +121,7 @@ def _dump(self):
         print("previous_gtids: %s" % self._previous_gtids)
 
     def __repr__(self):
-        return '<PreviousGtidEvent "%s">' % self._previous_gtids
+        return '<PreviousGtidsEvent "%s">' % self._previous_gtids
 
 
 class MariadbGtidEvent(BinLogEvent):

pymysqlreplication/packet.py

@@ -65,7 +65,7 @@ class BinLogPacketWrapper(object):
         constants.XID_EVENT: event.XidEvent,
         constants.INTVAR_EVENT: event.IntvarEvent,
         constants.GTID_LOG_EVENT: event.GtidEvent,
-        constants.PREVIOUS_GTIDS_LOG_EVENT: event.PreviousGtidEvent,
+        constants.PREVIOUS_GTIDS_LOG_EVENT: event.PreviousGtidsEvent,
         constants.STOP_EVENT: event.StopEvent,
         constants.BEGIN_LOAD_QUERY_EVENT: event.BeginLoadQueryEvent,
         constants.EXECUTE_LOAD_QUERY_EVENT: event.ExecuteLoadQueryEvent,

pymysqlreplication/tests/test_basic.py

@@ -22,7 +22,7 @@
 
 class TestBasicBinLogStreamReader(base.PyMySQLReplicationTestCase):
     def ignoredEvents(self):
-        return [GtidEvent, PreviousGtidEvent]
+        return [GtidEvent, PreviousGtidsEvent]
 
     def test_allowed_event_list(self):
         self.assertEqual(len(self.stream._allowed_event_list(None, None, False)), 17)
@@ -522,7 +522,7 @@ def test_end_log_pos(self):
 
 class TestMultipleRowBinLogStreamReader(base.PyMySQLReplicationTestCase):
     def ignoredEvents(self):
-        return [GtidEvent, PreviousGtidEvent]
+        return [GtidEvent, PreviousGtidsEvent]
 
     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))"
@@ -844,7 +844,7 @@ def test_read_query_event(self):
         query = "COMMIT;"
         self.execute(query)
 
-        self.assertIsInstance(self.stream.fetchone(), PreviousGtidEvent)
+        self.assertIsInstance(self.stream.fetchone(), PreviousGtidsEvent)
         firstevent = self.stream.fetchone()
         self.assertIsInstance(firstevent, GtidEvent)
 
@@ -894,7 +894,7 @@ def test_position_gtid(self):
 
         self.assertIsInstance(self.stream.fetchone(), RotateEvent)
         self.assertIsInstance(self.stream.fetchone(), FormatDescriptionEvent)
-        self.assertIsInstance(self.stream.fetchone(), PreviousGtidEvent)
+        self.assertIsInstance(self.stream.fetchone(), PreviousGtidsEvent)
         self.assertIsInstance(self.stream.fetchone(), GtidEvent)
         event = self.stream.fetchone()
 

pymysqlreplication/tests/test_data_type.py

@@ -32,7 +32,7 @@ def encode_value(v):
 
 class TestDataType(base.PyMySQLReplicationTestCase):
     def ignoredEvents(self):
-        return [GtidEvent, PreviousGtidEvent]
+        return [GtidEvent, PreviousGtidsEvent]
 
     def create_and_insert_value(self, create_query, insert_query):
         self.execute(create_query)