VladPolskiy/mariadb-connector-python
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-python.git synced 2025-08-02 13:56:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

CONPY-227: Replace collections.named_tuple

Browse Source 
Replaced collections.named_tuple by C-Pythons PyStruct_Sequence.
All conversion are done now before fetching a row: converting to
other result types than tuple (named tuple or dict) now have less
overhead and are significantly faster.
This commit is contained in:
Georg Richter
2022-10-10 09:01:19 +02:00
parent 903bd6e073
commit ce228b68da
6 changed files with 74 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/mariadb_python.h
View File

@ -208,6 +208,7 @@ typedef struct {
PyObject *status_callback;
#endif
PyObject *last_executed_stmt;
PyObject *converter;
} MrdbConnection;
typedef struct {

66
mariadb/cursors.py
View File

@ -18,7 +18,6 @@
#
import mariadb
import collections
import datetime
from numbers import Number
from mariadb.constants import CURSOR, STATUS, CAPABILITY, INDICATOR
@ -28,6 +27,8 @@ PARAMSTYLE_QMARK = 1
PARAMSTYLE_FORMAT = 2
PARAMSTYLE_PYFORMAT = 3
ROWS_ALL = -1
RESULT_TUPLE = 0
RESULT_NAMEDTUPLE = 1
RESULT_DICTIONARY = 2
@ -364,7 +365,7 @@ class Cursor(mariadb._mariadb.cursor):
"""
Internal use only
fetches row and converts values, if connections has a converter.
fetches row and converts values, if connection has a converter.
"""
self.check_closed()
@ -372,20 +373,7 @@ class Cursor(mariadb._mariadb.cursor):
# exception
if not self.field_count:
raise mariadb.ProgrammingError("Cursor doesn't have a result set")
row = super().fetchone()
if self._connection._converter and row:
tmp_l = list(row)
if not self._description:
self._description = super().description
for i, v in enumerate(row):
type = self.description[i][1]
if type in self._connection._converter:
func = self._connection._converter[type]
tmp_l[i] = func(v)
else:
tmp_l[i] = v
row = tuple(tmp_l)
return row
return super().fetchone()
def close(self):
"""
@ -412,17 +400,7 @@ class Cursor(mariadb._mariadb.cursor):
self.check_closed()
row = self._fetch_row()
if not row:
return row
if self._resulttype == RESULT_DICTIONARY:
ret = dict(zip(list(d[0] for d in self.description), row))
elif self._resulttype == RESULT_NAMEDTUPLE:
ret = collections.namedtuple('Row1', list(d[0]
for d in self.description))
ret = ret._make(row)
else:
ret = row
return ret
return row
def fetchmany(self, size: int = 0):
"""
@ -445,9 +423,7 @@ class Cursor(mariadb._mariadb.cursor):
if size == 0:
size = self.arraysize
rows = super().fetchrows(size)
return rows
return super().fetchrows(size)
def fetchall(self):
"""
@ -458,35 +434,7 @@ class Cursor(mariadb._mariadb.cursor):
produce a result set or execute() wasn't called before.
"""
self.check_closed()
rows = super().fetchrows(ROWS_EOF)
if self._connection._converter:
for idx, row in enumerate(rows):
tmp_l = list(row)
if not self._description:
self._description = super().description
for i, v in enumerate(row):
type = self.description[i][1]
if type in self._connection._converter:
func = self._connection._converter[type]
tmp_l[i] = func(v)
else:
tmp_l[i] = v
rows[idx] = tuple(tmp_l)
if self._resulttype == RESULT_TUPLE:
return rows
ret = []
for row in rows:
if self._resulttype == RESULT_DICTIONARY:
new_row = dict(zip(list(d[0] for d in self.description), row))
elif self._resulttype == RESULT_NAMEDTUPLE:
new_row = collections.namedtuple('Row1', list(d[0]
for d in self.description))
new_row = new_row._make(row)
ret.append(new_row)
return ret
return super().fetchrows(ROWS_EOF)
def __iter__(self):
return iter(self.fetchone, None)

51
mariadb/mariadb_codecs.c
View File

@ -57,7 +57,7 @@ enum enum_extended_field_type mariadb_extended_field_type(const MYSQL_FIELD *fie
/*
converts a Python date/time/datetime object to MYSQL_TIME
*/
*/
static void
mariadb_pydate_to_tm(enum enum_field_types type,
PyObject *obj,
@ -403,6 +403,27 @@ static PyObject *Mrdb_GetTimeDelta(MYSQL_TIME *tm)
return PyDelta_FromDSU(days, second, second_part);
}
static PyObject *ma_convert_value(MrdbCursor *self,
enum enum_field_types type,
PyObject *value)
{
PyObject *key= PyLong_FromLongLong(type);
PyObject *func;
PyObject *new_value= NULL;
if (!self->connection->converter || value == Py_None)
return NULL;
if ((func= PyDict_GetItem(self->connection->converter, key)) &&
PyCallable_Check(func))
{
PyObject *arglist= PyTuple_New(1);
PyTuple_SetItem(arglist, 0, value);
new_value= PyObject_CallObject(func, arglist);
}
return new_value;
}
void
field_fetch_fromtext(MrdbCursor *self, char *data, unsigned int column)
@ -541,6 +562,20 @@ field_fetch_fromtext(MrdbCursor *self, char *data, unsigned int column)
default:
break;
}
/* check if values need to be converted */
if (self->connection->converter)
{
PyObject *val;
enum enum_field_types type;
if (ext_type == EXT_TYPE_JSON)
type= MYSQL_TYPE_JSON;
else
type= self->fields[column].type;
if ((val= ma_convert_value(self, type, self->values[column])))
self->values[column]= val;
}
}
/* field_fetch_callback
@ -772,6 +807,20 @@ field_fetch_callback(void *data, unsigned int column, unsigned char **row)
default:
break;
}
/* check if values need to be converted */
if (self->connection->converter)
{
PyObject *val;
enum enum_field_types type;
if (ext_type == EXT_TYPE_JSON)
type= MYSQL_TYPE_JSON;
else
type= self->fields[column].type;
if ((val= ma_convert_value(self, type, self->values[column])))
self->values[column]= val;
}
}
/*
mariadb_get_column_info

5
mariadb/mariadb_connection.c
View File

@ -181,6 +181,11 @@ PyMemberDef MrdbConnection_Members[] =
offsetof(MrdbConnection, closed),
READONLY,
"Indicates if connection was closed"},
{"_converter",
T_OBJECT,
offsetof(MrdbConnection, converter),
0,
"Conversion dictionary"},
{NULL} /* always last */
};
#if MARIADB_PACKAGE_VERSION_ID > 30301

5
mariadb/mariadb_cursor.c
View File

@ -203,6 +203,11 @@ static struct PyMemberDef MrdbCursor_Members[] =
offsetof(MrdbCursor, parseinfo.paramlist),
READONLY,
MISSING_DOC},
{"_resulttype",
T_UINT,
offsetof(MrdbCursor, result_format),
0,
MISSING_DOC},
{"_keys",
T_OBJECT,
offsetof(MrdbCursor, parseinfo.keys),

7
testing/test/integration/test_dbapi20.py
View File

@ -142,6 +142,7 @@ class DatabaseAPI20Test(unittest.TestCase):
# execute is busted.
pass
finally:
cur.close()
con.close()
def _connect(self):
@ -252,8 +253,8 @@ class DatabaseAPI20Test(unittest.TestCase):
try:
cur = con.cursor()
finally:
cur.close()
con.close()
del cur
def test_cursor_isolation(self):
con = self._connect()
@ -272,6 +273,8 @@ class DatabaseAPI20Test(unittest.TestCase):
self.assertEqual(len(booze[0]), 1)
self.assertEqual(booze[0][0], 'Victoria Bitter')
finally:
cur1.close()
cur2.close()
con.close()
def test_description(self):
@ -326,6 +329,7 @@ class DatabaseAPI20Test(unittest.TestCase):
'executing no-result statements (eg. DDL)'
)
finally:
cur.close()
con.close()
def test_rowcount(self):
@ -349,6 +353,7 @@ class DatabaseAPI20Test(unittest.TestCase):
'executing no-result statements'
)
finally:
cur.close()
con.close()
lower_func = 'lower'