Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	CHANGELOG.md

Author: long2ice

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 ### 0.1.5
 
+- Remove `byte2int` and `int2byte`.
 - Fix warning for sql_mode.
 
 ### 0.1.4

asyncmy/replication/events.py

@@ -1,8 +1,6 @@
 import binascii
 import struct
 
-from asyncmy.replication.utils import byte2int, int2byte
-
 
 class BinLogEvent:
     def __init__(
@@ -37,7 +35,7 @@ def processed(self):
     def _read_table_id(self):
         # Table ID is 6 byte
         # pad little-endian number
-        table_id = self.packet.read(6) + int2byte(0) + int2byte(0)
+        table_id = self.packet.read(6) + bytes(0) + bytes(0)
         return struct.unpack("<Q", table_id)[0]
 
     async def init(self):
@@ -52,7 +50,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
             from_packet, event_size, table_map, ctl_connection, **kwargs
         )
 
-        self.commit_flag = byte2int(self.packet.read(1)) == 1
+        self.commit_flag = self.packet.read(1) == 1
         self.sid = self.packet.read(16)
         self.gno = struct.unpack("<Q", self.packet.read(8))[0]
 
@@ -129,7 +127,7 @@ def __init__(self, from_packet, event_size, table_map, ctl_connection, **kwargs)
         # Post-header
         self.slave_proxy_id = self.packet.read_uint32()
         self.execution_time = self.packet.read_uint32()
-        self.schema_length = byte2int(self.packet.read(1))
+        self.schema_length = self.packet.read(1)
         self.error_code = self.packet.read_uint16()
         self.status_vars_length = self.packet.read_uint16()
 

asyncmy/replication/packets.py

@@ -48,7 +48,6 @@
     WRITE_ROWS_EVENT_V2,
     XID_EVENT,
 )
-from asyncmy.replication.utils import byte2int
 
 
 class BinLogPacket:
@@ -104,7 +103,7 @@ def __init__(
 
         # Header
         self.timestamp = unpack[1]
-        self.event_type = byte2int(unpack[2])
+        self.event_type = unpack[2]
         self.server_id = unpack[3]
         self.event_size = unpack[4]
         # position of the next event
@@ -167,7 +166,7 @@ def advance(self, size):
             self._packet.advance(size)
 
     def read_length_coded_binary(self):
-        c = byte2int(self.read(1))
+        c = self.read(1)
         if c == NULL_COLUMN:
             return None
         if c < UNSIGNED_CHAR_COLUMN:

asyncmy/replication/row_events.py

@@ -40,7 +40,6 @@
 from .errors import TableMetadataUnavailableError
 from .events import BinLogEvent
 from .table import Table
-from .utils import byte2int
 
 
 class RowsEvent(BinLogEvent):
@@ -540,10 +539,10 @@ def __init__(self, from_packet, event_size, table_map, connection, **kwargs):
         self.flags = struct.unpack("<H", self.packet.read(2))[0]
 
         # Payload
-        self.schema_length = byte2int(self.packet.read(1))
+        self.schema_length = self.packet.read(1)
         self.schema = self.packet.read(self.schema_length).decode()
         self.packet.advance(1)
-        self.table_length = byte2int(self.packet.read(1))
+        self.table_length = self.packet.read(1)
         self.table_name = self.packet.read(self.table_length).decode()
         schema_table = f"{self.schema}.{self.table_name}"
         if self._only_tables is not None and schema_table not in self._only_tables:
@@ -606,7 +605,7 @@ async def init(self):
                         "COLUMN_TYPE": "BLOB",  # we don't know what it is, so let's not do anything with it.
                         "COLUMN_KEY": "",
                     }
-                col = Column(byte2int(column_type), column_schema, self.packet)
+                col = Column(column_type, column_schema, self.packet)
                 self.columns.append(col)
 
         self._table = Table(

asyncmy/replication/utils.py

@@ -1,4 +1,3 @@
-import faker
 import MySQLdb
 import pymysql
 
@@ -8,15 +7,14 @@
 conn_mysqlclient = MySQLdb.connect(**connection_kwargs)
 conn_pymysql = pymysql.connect(**connection_kwargs)
 COUNT = 50000
-faker = faker.Faker()
 
 data = [
     (
         1,
-        faker.date_time().date(),
-        faker.date_time(),
+        "2021-01-01",
+        "2020-07-16 22:49:54",
         1,
-        faker.name(),
+        "asyncmy",
         1,
     )
     for _ in range(COUNT)

benchmark/__init__.py

@@ -8,14 +8,16 @@
 from benchmark import COUNT, connection_kwargs
 from benchmark.decorators import cleanup, fill_data
 
+count = int(COUNT / 5)
+
 
 @cleanup
 @fill_data
 async def delete_asyncmy():
     conn = await asyncmy.connect(**connection_kwargs)
     async with conn.cursor() as cur:
         t = time.time()
-        for i in range(COUNT):
+        for i in range(count):
             ret = await cur.execute("delete from test.asyncmy where `id`=%s", (i + 1,))
             assert ret == 1
         return time.time() - t
@@ -27,7 +29,7 @@ async def delete_aiomysql():
     conn = await aiomysql.connect(**connection_kwargs)
     async with conn.cursor() as cur:
         t = time.time()
-        for i in range(COUNT):
+        for i in range(count):
             ret = await cur.execute("delete from test.asyncmy where `id`=%s", (i + 1,))
             assert ret == 1
         return time.time() - t
@@ -39,7 +41,7 @@ def delete_mysqlclient():
     conn = MySQLdb.connect(**connection_kwargs)
     cur = conn.cursor()
     t = time.time()
-    for i in range(COUNT):
+    for i in range(count):
         ret = cur.execute("delete from test.asyncmy where `id`=%s", (i + 1,))
         assert ret == 1
     return time.time() - t
@@ -51,7 +53,7 @@ def delete_pymysql():
     conn = pymysql.connect(**connection_kwargs)
     cur = conn.cursor()
     t = time.time()
-    for i in range(COUNT):
+    for i in range(count):
         ret = cur.execute("delete from test.asyncmy where `id`=%s", (i + 1,))
         assert ret == 1
     return time.time() - t

benchmark/benchmark_delete.py

@@ -8,14 +8,16 @@
 from benchmark import COUNT, connection_kwargs
 from benchmark.decorators import cleanup, fill_data
 
+count = int(COUNT / 5)
+
 
 @cleanup
 @fill_data
 async def update_asyncmy():
     conn = await asyncmy.connect(**connection_kwargs)
     async with conn.cursor() as cur:
         t = time.time()
-        for i in range(COUNT):
+        for i in range(count):
             await cur.execute(
                 "update test.asyncmy set `string`=%s where `id` = %s",
                 (
@@ -32,7 +34,7 @@ async def update_aiomysql():
     conn = await aiomysql.connect(**connection_kwargs)
     async with conn.cursor() as cur:
         t = time.time()
-        for i in range(COUNT):
+        for i in range(count):
             await cur.execute(
                 "update test.asyncmy set `string`=%s where `id` = %s",
                 (
@@ -49,7 +51,7 @@ def update_mysqlclient():
     conn = MySQLdb.connect(**connection_kwargs)
     cur = conn.cursor()
     t = time.time()
-    for i in range(COUNT):
+    for i in range(count):
         cur.execute(
             "update test.asyncmy set `string`=%s where `id` = %s",
             (
@@ -66,7 +68,7 @@ def update_pymysql():
     conn = pymysql.connect(**connection_kwargs)
     cur = conn.cursor()
     t = time.time()
-    for i in range(COUNT):
+    for i in range(count):
         cur.execute(
             "update test.asyncmy set `string`=%s where `id` = %s",
             (

benchmark/benchmark_update.py

@@ -44,7 +44,7 @@
   `string` varchar(200) DEFAULT NULL,
   `tinyint` tinyint DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=400001 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci"""
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci"""
     )
     cur.execute("truncate table test.asyncmy")