resolve conflicts

Author: ebang091

Diff for: pymysqlreplication/event.py

@@ -309,19 +309,12 @@ class XAPrepareEvent(BinLogEvent):
     An XA prepare event is generated for a XA prepared transaction.
     Like Xid_event, it contains XID of the **prepared** transaction.
 
-    For more information: `[see details] <https://dev.mysql.com/doc/refman/8.0/en/xa-statements.html>`_.
-
-<<<<<<< HEAD
-    :ivar one_phase: current XA transaction commit method
-    :ivar xid_format_id: a number that identifies the format used by the gtrid and bqual values
-    :ivar xid: serialized XID representation of XA transaction (xid_gtrid + xid_bqual)
-=======
-    In detail, the class creates the following python objects in the constructor:
+    For more information: `[see XAPrepareEvent] <https://dev.mysql.com/doc/refman/8.0/en/xa-statements.html>`_.
 
     :ivar one_phase: str - current XA transaction commit method
     :ivar xid_format_id: int - a number that identifies the format used by the gtrid and bqual values
     :ivar xid: str - serialized XID representation of XA transaction (xid_gtrid + xid_bqual)
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
+
     """
     def __init__(self, 
                  from_packet: Type[MysqlPacket], 
@@ -354,35 +347,14 @@ def _dump(self) -> None:
 
 class FormatDescriptionEvent(BinLogEvent):
     """
-<<<<<<< HEAD
-    Represents a Format Description Event in the MySQL binary log.
+    The event Represents a Format Description Event in the MySQL binary log.
 
     This event is written at the start of a binary log file for binlog version 4.
     It provides the necessary information to decode subsequent events in the file.
 
     :ivar binlog_version: int - Version of the binary log format.
     :ivar mysql_version_str: str - Server's MySQL version in string format.
     """
-
-    def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs):
-        super().__init__(from_packet, event_size, table_map,
-                                          ctl_connection, **kwargs)
-        self.binlog_version = struct.unpack('<H', self.packet.read(2))
-        self.mysql_version_str = self.packet.read(50).rstrip(b'\0').decode()
-        numbers = self.mysql_version_str.split('-')[0]
-        self.mysql_version = tuple(map(int, numbers.split('.')))
-=======
-    The event represents a Format Description Event in the MySQL binary log.
-    
-    This event is written at the start of a binary log file for binlog version 4.
-    It provides the necessary information to decode subsequent events in the file.
-
-    In detail, the class creates the following python objects in the constructor:
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
-
-    :ivar binlog_version: str - Version of the binary log format
-    :ivar mysql_version_str: str - Server's MySQL version in string format
-    """
     def __init__(self, 
                  from_packet: Type[MysqlPacket], 
                  event_size: int, 
@@ -409,22 +381,12 @@ class StopEvent(BinLogEvent):
 class XidEvent(BinLogEvent):
 <<<<<<< HEAD
     """
-    A COMMIT event generated when COMMIT of a transaction that modifies one or more tables of an XA-capable storage engine occurs.
-
-    For more information: `[see details] <https://mariadb.com/kb/en/xid_event/>`_.
-
-    :ivar xid: uint - Transaction ID for 2 Phase Commit.
-=======
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
-    """
-    A COMMIT event is generated when COMMIT of a transaction that modifies 
+    A COMMIT event generated when COMMIT of a transaction that modifies 
     one or more tables of an XA-capable storage engine occurs.
 
-    For more information : `[see details] <https://mariadb.com/kb/en/xid_event/>`_.
+    For more information: `[see XidEvent] <https://mariadb.com/kb/en/xid_event/>`_.
 
-    In detail, the class creates the following python objects in the constructor:
- 
-    :ivar xid: int - Transaction ID for 2 Phase Commit
+    :ivar xid: uint - Transaction ID for 2 Phase Commit.
     """
     def __init__(self, 
                  from_packet: Type[MysqlPacket], 
@@ -457,19 +419,11 @@ class HeartbeatLogEvent(BinLogEvent):
     (see Binlog_sender::send_events in sql/rpl_binlog_sender.cc)
 
     Warning:
-<<<<<<< HEAD
     That makes 106 bytes of data for skipped event in the binlog.
     *this is also the case with GTID replication*.
     To mitigate such behavior, you are expected to keep the binlog small
     (see max_binlog_size, defaults to 1G).
     In any case, the timestamp is 0 (as in 1970-01-01T00:00:00).
-=======
-    That makes 106 bytes of data for skipped event in the binlog. 
-    *this is also the case with GTID replication*.  
-    To mitigate such behavior, you are expected to keep the binlog small 
-    (see max_binlog_size, defaults to 1G).  
-    In any case, the timestamp is 0 (as in 1970-01-01T00:00:00). 
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
 
     In detail, the class creates the following python objects in the constructor:
 
@@ -532,15 +486,9 @@ def __init__(self,
         self.schema: str = self.packet.read(self.schema_length)
         self.packet.advance(1)
 
-<<<<<<< HEAD
-        query = self.packet.read(event_size - 13 - self.status_vars_length
-                                 - self.schema_length - 1)
-        self.query = query.decode("utf-8", errors='backslashreplace')
-=======
+        #string[EOF]    query
         self.query: str = self.packet.read(event_size - 13 - self.status_vars_length
                                            - self.schema_length - 1).decode("utf-8")
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
-        #string[EOF]    query
 
     def _dump(self) -> None:
         """Dump the python objects for the event."""
@@ -605,11 +553,7 @@ def _read_status_vars_value_for_key(self, key: int) -> Union[None, NoReturn]:
         elif key == Q_TIME_ZONE_CODE:                 # 0x05
             time_zone_len = self.packet.read_uint8()
             if time_zone_len:
-<<<<<<< HEAD
-                self.time_zone = self.packet.read(time_zone_len)
-=======
                 self.time_zone: str = self.packet.read(time_zone_len) 
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
         elif key == Q_CATALOG_NZ_CODE:                # 0x06
             catalog_len = self.packet.read_uint8()
             if catalog_len:
@@ -756,19 +700,11 @@ def _dump(self) -> None:
 
 class IntvarEvent(BinLogEvent):
     """
-<<<<<<< HEAD
     Stores the value of auto-increment variables.
     This event will be created just before a QueryEvent.
 
     :ivar type: int - 1 byte identifying the type of variable stored.
-=======
-    The event stores the value of auto-increment variables.
-    It will be created just before a QueryEvent.
-
-    In detail, the class creates the following python objects in the constructor:
-
-    :ivar type: int - 1 byte identifying the type of variable stored. \
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
+    
     Can be either LAST_INSERT_ID_EVENT (1) or INSERT_ID_EVENT (2).
     :ivar value: int - The value of the variable
     """
@@ -804,11 +740,7 @@ class RandEvent(BinLogEvent):
     :ivar seed1: int - value for the first seed
     :ivar seed2: int - value for the second seed    
     """
-<<<<<<< HEAD
-    def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs):
-        super().__init__(from_packet, event_size, table_map,
-                                        ctl_connection, **kwargs)
-=======
+
     def __init__(self, 
                  from_packet: Type[MysqlPacket], 
                  event_size: int, 
@@ -817,7 +749,6 @@ def __init__(self,
                  **kwargs: str):
         super().__init__(from_packet, event_size, table_map, ctl_connection, **kwargs)
 
->>>>>>> 07b561d (add type hints to the rest of the events, improve docstring readability in some events)
         # Payload
         self._seed1: int = self.packet.read_uint64()
         self._seed2: int = self.packet.read_uint64()