Revert "setting BinlogStream class parameter optional_meta_data "

This reverts commit b882122.

Author: sean-k1

pymysqlreplication/binlogstream.py

@@ -142,8 +142,7 @@ def __init__(self, connection_settings, server_id,
                  slave_heartbeat=None,
                  is_mariadb=False,
                  annotate_rows_event=False,
-                 ignore_decode_errors=False,
-                 optional_meta_data=False):
+                 ignore_decode_errors=False):
         """
         Attributes:
             ctl_connection_settings: Connection settings for cluster holding
@@ -207,7 +206,7 @@ def __init__(self, connection_settings, server_id,
             only_events, ignored_events, filter_non_implemented_events)
         self.__fail_on_table_metadata_unavailable = fail_on_table_metadata_unavailable
         self.__ignore_decode_errors = ignore_decode_errors
-        self.__optional_meta_data = optional_meta_data
+
         # 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(
@@ -537,8 +536,7 @@ def fetchone(self):
                                                self.__ignored_schemas,
                                                self.__freeze_schema,
                                                self.__fail_on_table_metadata_unavailable,
-                                               self.__ignore_decode_errors,
-                                               self.__optional_meta_data)
+                                               self.__ignore_decode_errors)
 
             if binlog_event.event_type == ROTATE_EVENT:
                 self.log_pos = binlog_event.event.position

pymysqlreplication/event.py

@@ -16,8 +16,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection,
                  ignored_schemas=None,
                  freeze_schema=False,
                  fail_on_table_metadata_unavailable=False,
-                 ignore_decode_errors=False,
-                 optional_meta_data=False):
+                 ignore_decode_errors=False):
         self.packet = from_packet
         self.table_map = table_map
         self.event_type = self.packet.event_type

pymysqlreplication/packet.py

@@ -105,8 +105,7 @@ def __init__(self, from_packet, table_map,
                  ignored_schemas,
                  freeze_schema,
                  fail_on_table_metadata_unavailable,
-                 ignore_decode_errors,
-                 optional_meta_data):
+                 ignore_decode_errors):
         # -1 because we ignore the ok byte
         self.read_bytes = 0
         # Used when we want to override a value in the data buffer
@@ -152,8 +151,7 @@ def __init__(self, from_packet, table_map,
                                  ignored_schemas=ignored_schemas,
                                  freeze_schema=freeze_schema,
                                  fail_on_table_metadata_unavailable=fail_on_table_metadata_unavailable,
-                                 ignore_decode_errors=ignore_decode_errors,
-                                 optional_meta_data=optional_meta_data)
+                                 ignore_decode_errors=ignore_decode_errors)
         if self.event._processed == False:
             self.event = None
 

pymysqlreplication/row_event.py

@@ -634,7 +634,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
         self.__only_schemas = kwargs["only_schemas"]
         self.__ignored_schemas = kwargs["ignored_schemas"]
         self.__freeze_schema = kwargs["freeze_schema"]
-        self.__optional_meta_data = kwargs["optional_meta_data"]
+
         # Post-Header
         self.table_id = self._read_table_id()
 
@@ -672,8 +672,6 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
 
         if self.table_id in table_map:
             self.column_schemas = table_map[self.table_id].column_schemas
-        elif self.__optional_meta_data:
-            self.column_schemas = []
         else:
             self.column_schemas = self._ctl_connection._get_table_information(self.schema, self.table)
 
@@ -813,8 +811,10 @@ def _sync_column_info(self):
         column_schemas = []
         if len(self.optional_metadata.column_name_list) == 0:
             return
-        if not self.__optional_meta_data:
-            # If optional_meta_data is False Do not sync Event Time Column Schemas
+        if len(self.column_schemas) == self.column_count:
+            # If the column schema length matches the number of columns,
+            # updating column schema information from optional metadata is not advisable.
+            # The reason is that the information obtained from optional metadata is not sufficient.
             return
 
         charset_pos = 0