Cleanup after @bjoernhaeuser feedback

Author: julien-duponchelle

pymysqlreplication/binlogstream.py

@@ -49,7 +49,12 @@ def __init__(self, connection_settings, server_id, resume_stream=False,
         self.__connected_ctl = False
         self.__resume_stream = resume_stream
         self.__blocking = blocking
-        self.__only_events = self._allowed_event_list(only_events, ignored_events, filter_non_implemented_events)
+        self.__allowed_events = self._allowed_event_list(only_events, ignored_events, filter_non_implemented_events)
+
+        # We can't filter on packet level TABLE_MAP and rotate event because we need
+        # them for handling other operations
+        self.__allowed_events_in_packet = frozenset([TableMapEvent, RotateEvent]).union(self.__allowed_events)
+
         self.__server_id = server_id
         self.__use_checksum = False
 
@@ -228,7 +233,7 @@ def fetchone(self):
             binlog_event = BinLogPacketWrapper(pkt, self.table_map,
                                                self._ctl_connection,
                                                self.__use_checksum,
-                                               self.__only_events)
+                                               self.__allowed_events_in_packet)
             if binlog_event.event_type == TABLE_MAP_EVENT:
                 self.table_map[binlog_event.event.table_id] = \
                     binlog_event.event.get_table()
@@ -251,7 +256,7 @@ def fetchone(self):
 
             # event is none if we have filter it on packet level
             # we filter also not allowed events
-            if binlog_event.event is None or (binlog_event.event.__class__ not in self.__only_events):
+            if binlog_event.event is None or (binlog_event.event.__class__ not in self.__allowed_events):
                 continue
 
             return binlog_event.event

pymysqlreplication/packet.py

@@ -82,11 +82,8 @@ def __init__(self, from_packet, table_map, ctl_connection, use_checksum, allowed
         self.event = None
         event_class = self.__event_map.get(self.event_type, event.NotImplementedEvent)
 
-        # We can't filter on packet level TABLE_MAP and rotate event because we need
-        # them for handling other operations
-        if not self.event_type in (constants.TABLE_MAP_EVENT, constants.ROTATE_EVENT):
-            if event_class not in allowed_events:
-                return
+        if event_class not in allowed_events:
+            return
         self.event = event_class(self, event_size_without_header, table_map,
                                  ctl_connection)