more cython code

Author: long2ice

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.2
 
+### 0.2.1
+
+- More cython code.
+
 ### 0.2.0
 
 - Fix `cursor.close`.

asyncmy/connection.pyx

@@ -997,10 +997,12 @@ class Connection:
 
 cdef class MySQLResult:
     cdef:
-        public connection, message, description, rows, has_next, unbuffered_active
-        public int affected_rows, warning_count, field_count, server_status
+        public connection
+        public bytes message
+        public int affected_rows, warning_count, field_count, server_status, unbuffered_active, has_next
         public list fields, converters
         public unsigned long insert_id
+        public tuple rows, description
 
     def __init__(self, connection: Connection):
         self.connection = connection
@@ -1012,7 +1014,7 @@ cdef class MySQLResult:
         self.field_count = 0
         self.description = None
         self.rows = None
-        self.has_next = None
+        self.has_next = False
         self.unbuffered_active = False
 
     def __del__(self):

asyncmy/cursors.pyx

@@ -81,7 +81,7 @@ cdef class Cursor:
         else:
             raise StopAsyncIteration  # noqa
 
-    cpdef _get_db(self):
+    def _get_db(self):
         if not self.connection:
             raise errors.ProgrammingError("Cursor closed")
         return self.connection

asyncmy/protocol.pyx

@@ -118,7 +118,7 @@ cdef class MysqlPacket:
         self._position = end_pos + 1
         return result
 
-    cpdef read_length_encoded_integer(self):
+    cpdef unsigned long read_length_encoded_integer(self):
         """
         Read a 'Length Coded Binary' number from the data buffer.
 
@@ -127,7 +127,7 @@ cdef class MysqlPacket:
         """
         cdef int c = self.read_uint8()
         if c == NULL_COLUMN:
-            return None
+            return 0
         if c < UNSIGNED_CHAR_COLUMN:
             return c
         elif c == UNSIGNED_SHORT_COLUMN:
@@ -137,7 +137,7 @@ cdef class MysqlPacket:
         elif c == UNSIGNED_INT64_COLUMN:
             return self.read_uint64()
 
-    def read_length_coded_string(self):
+    cpdef bytes read_length_coded_string(self):
         """
         Read a 'Length Coded String' from the data buffer.
 
@@ -147,7 +147,7 @@ cdef class MysqlPacket:
         """
         length = self.read_length_encoded_integer()
         if length is None:
-            return None
+            return b""
         return self.read(length)
 
     cpdef tuple read_struct(self, str fmt):

asyncmy/version.py

@@ -1 +1 @@
-__VERSION__ = "0.2.0"
+__VERSION__ = "0.2.1"

benchmark/__init__.py

@@ -1,5 +1,8 @@
 import MySQLdb
 import pymysql
+import uvloop
+
+uvloop.install()
 
 connection_kwargs = dict(
     host="127.0.0.1", port=3306, user="root", password="123456", autocommit=True

benchmark/benchmark_delete.py

@@ -1,10 +1,11 @@
+import asyncio
 import time
 
 import aiomysql
+import asyncmy
 import MySQLdb
 import pymysql
 
-import asyncmy
 from benchmark import COUNT, connection_kwargs
 from benchmark.decorators import cleanup, fill_data
 
@@ -57,3 +58,24 @@ def delete_pymysql():
         ret = cur.execute("delete from test.asyncmy where `id`=%s", (i + 1,))
         assert ret == 1
     return time.time() - t
+
+
+def benchmark_delete():
+    loop = asyncio.get_event_loop()
+    delete_asyncmy_ret = loop.run_until_complete(delete_asyncmy())
+    delete_mysqlclient_ret = delete_mysqlclient()
+    delete_pymysql_ret = delete_pymysql()
+    delete_aiomysql_ret = loop.run_until_complete(delete_aiomysql())
+    return sorted(
+        {
+            "mysqlclient": delete_mysqlclient_ret,
+            "asyncmy": delete_asyncmy_ret,
+            "pymysql": delete_pymysql_ret,
+            "aiomysql": delete_aiomysql_ret,
+        }.items(),
+        key=lambda x: x[1],
+    )
+
+
+if __name__ == "__main__":
+    print(benchmark_delete())

benchmark/benchmark_insert.py

@@ -1,9 +1,17 @@
+import asyncio
 import time
 
 import aiomysql
-
 import asyncmy
-from benchmark import COUNT, conn_mysqlclient, conn_pymysql, connection_kwargs, data, sql
+
+from benchmark import (
+    COUNT,
+    conn_mysqlclient,
+    conn_pymysql,
+    connection_kwargs,
+    data,
+    sql,
+)
 from benchmark.decorators import cleanup
 
 
@@ -43,3 +51,24 @@ def insert_pymysql():
     ret = cur.executemany(sql, data)
     assert ret == COUNT
     return time.time() - t
+
+
+def benchmark_insert():
+    loop = asyncio.get_event_loop()
+    insert_mysqlclient_ret = insert_mysqlclient()
+    insert_asyncmy_ret = loop.run_until_complete(insert_asyncmy())
+    insert_pymysql_ret = insert_pymysql()
+    insert_aiomysql_ret = loop.run_until_complete(insert_aiomysql())
+    return sorted(
+        {
+            "mysqlclient": insert_mysqlclient_ret,
+            "asyncmy": insert_asyncmy_ret,
+            "pymysql": insert_pymysql_ret,
+            "aiomysql": insert_aiomysql_ret,
+        }.items(),
+        key=lambda x: x[1],
+    )
+
+
+if __name__ == "__main__":
+    print(benchmark_insert())

benchmark/benchmark_select.py

@@ -1,9 +1,15 @@
+import asyncio
 import time
 
 import aiomysql
-
 import asyncmy
-from benchmark import COUNT, conn_mysqlclient, conn_pymysql, connection_kwargs
+
+from benchmark import (
+    COUNT,
+    conn_mysqlclient,
+    conn_pymysql,
+    connection_kwargs,
+)
 from benchmark.decorators import cleanup, fill_data
 
 
@@ -55,3 +61,24 @@ def select_pymysql():
         res = cur.fetchall()
         assert len(res) == 1
     return time.time() - t
+
+
+def benchmark_select():
+    loop = asyncio.get_event_loop()
+    select_mysqlclient_ret = select_mysqlclient()
+    select_asyncmy_ret = loop.run_until_complete(select_asyncmy())
+    select_pymysql_ret = select_pymysql()
+    select_aiomysql_ret = loop.run_until_complete(select_aiomysql())
+    return sorted(
+        {
+            "mysqlclient": select_mysqlclient_ret,
+            "asyncmy": select_asyncmy_ret,
+            "pymysql": select_pymysql_ret,
+            "aiomysql": select_aiomysql_ret,
+        }.items(),
+        key=lambda x: x[1],
+    )
+
+
+if __name__ == "__main__":
+    print(benchmark_select())

benchmark/benchmark_update.py

@@ -1,10 +1,11 @@
+import asyncio
 import time
 
 import aiomysql
+import asyncmy
 import MySQLdb
 import pymysql
 
-import asyncmy
 from benchmark import COUNT, connection_kwargs
 from benchmark.decorators import cleanup, fill_data
 
@@ -77,3 +78,24 @@ def update_pymysql():
             ),
         )
     return time.time() - t
+
+
+def benchmark_update():
+    loop = asyncio.get_event_loop()
+    update_mysqlclient_ret = update_mysqlclient()
+    update_asyncmy_ret = loop.run_until_complete(update_asyncmy())
+    update_pymysql_ret = update_pymysql()
+    update_aiomysql_ret = loop.run_until_complete(update_aiomysql())
+    return sorted(
+        {
+            "mysqlclient": update_mysqlclient_ret,
+            "asyncmy": update_asyncmy_ret,
+            "pymysql": update_pymysql_ret,
+            "aiomysql": update_aiomysql_ret,
+        }.items(),
+        key=lambda x: x[1],
+    )
+
+
+if __name__ == "__main__":
+    print(benchmark_update())

benchmark/main.py

@@ -1,35 +1,11 @@
 import asyncio
-
-import uvloop
 from rich.pretty import pprint
+from benchmark.benchmark_delete import benchmark_delete
+from benchmark.benchmark_insert import benchmark_insert, conn_mysqlclient
+from benchmark.benchmark_select import benchmark_select
+from benchmark.benchmark_update import benchmark_update
 
-from benchmark import conn_mysqlclient
-from benchmark.benchmark_delete import (
-    delete_aiomysql,
-    delete_asyncmy,
-    delete_mysqlclient,
-    delete_pymysql,
-)
-from benchmark.benchmark_insert import (
-    insert_aiomysql,
-    insert_asyncmy,
-    insert_mysqlclient,
-    insert_pymysql,
-)
-from benchmark.benchmark_select import (
-    select_aiomysql,
-    select_asyncmy,
-    select_mysqlclient,
-    select_pymysql,
-)
-from benchmark.benchmark_update import (
-    update_aiomysql,
-    update_asyncmy,
-    update_mysqlclient,
-    update_pymysql,
-)
 
-uvloop.install()
 loop = asyncio.get_event_loop()
 
 if __name__ == "__main__":
@@ -48,66 +24,10 @@
     )
     cur.execute("truncate table test.asyncmy")
 
-    insert_mysqlclient_ret = insert_mysqlclient()
-    insert_asyncmy_ret = loop.run_until_complete(insert_asyncmy())
-    insert_pymysql_ret = insert_pymysql()
-    insert_aiomysql_ret = loop.run_until_complete(insert_aiomysql())
-    pprint("insert finish!")
-
-    select_mysqlclient_ret = select_mysqlclient()
-    select_asyncmy_ret = loop.run_until_complete(select_asyncmy())
-    select_pymysql_ret = select_pymysql()
-    select_aiomysql_ret = loop.run_until_complete(select_aiomysql())
-    pprint("select finish!")
-
-    update_mysqlclient_ret = update_mysqlclient()
-    update_asyncmy_ret = loop.run_until_complete(update_asyncmy())
-    update_pymysql_ret = update_pymysql()
-    update_aiomysql_ret = loop.run_until_complete(update_aiomysql())
-    pprint("update finish!")
-
-    delete_mysqlclient_ret = delete_mysqlclient()
-    delete_asyncmy_ret = loop.run_until_complete(delete_asyncmy())
-    delete_pymysql_ret = delete_pymysql()
-    delete_aiomysql_ret = loop.run_until_complete(delete_aiomysql())
-    pprint("delete finish!")
-
     ret = {
-        "select": sorted(
-            {
-                "mysqlclient": select_mysqlclient_ret,
-                "asyncmy": select_asyncmy_ret,
-                "pymysql": select_pymysql_ret,
-                "aiomysql": select_aiomysql_ret,
-            }.items(),
-            key=lambda x: x[1],
-        ),
-        "insert": sorted(
-            {
-                "mysqlclient": insert_mysqlclient_ret,
-                "asyncmy": insert_asyncmy_ret,
-                "pymysql": insert_pymysql_ret,
-                "aiomysql": insert_aiomysql_ret,
-            }.items(),
-            key=lambda x: x[1],
-        ),
-        "update": sorted(
-            {
-                "mysqlclient": update_mysqlclient_ret,
-                "asyncmy": update_asyncmy_ret,
-                "pymysql": update_pymysql_ret,
-                "aiomysql": update_aiomysql_ret,
-            }.items(),
-            key=lambda x: x[1],
-        ),
-        "delete": sorted(
-            {
-                "mysqlclient": delete_mysqlclient_ret,
-                "asyncmy": delete_asyncmy_ret,
-                "pymysql": delete_pymysql_ret,
-                "aiomysql": delete_aiomysql_ret,
-            }.items(),
-            key=lambda x: x[1],
-        ),
+        "select": benchmark_select(),
+        "insert": benchmark_insert(),
+        "update": benchmark_update(),
+        "delete": benchmark_delete(),
     }
     pprint(ret)

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "asyncmy"
-version = "0.2.0"
+version = "0.2.1"
 description = "A fast asyncio MySQL driver"
 authors = ["long2ice <[email protected]>"]
 license = "Apache-2.0"