Move _pysqlite_converters to global state

Erlend E. Aasland · Erlend E. Aasland · commit 33d9dc06fe6c · 2021-07-15T00:49:09.000+02:00
diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c
@@ -147,7 +147,8 @@ _pysqlite_get_converter(const char *keystr, Py_ssize_t keylen)
         return NULL;
     }
 
-    retval = PyDict_GetItemWithError(_pysqlite_converters, upcase_key);
+    pysqlite_state *state = pysqlite_get_state(NULL);
+    retval = PyDict_GetItemWithError(state->converters, upcase_key);
     Py_DECREF(upcase_key);
 
     return retval;
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
@@ -42,7 +42,6 @@ module _sqlite3
 /*[clinic end generated code: output=da39a3ee5e6b4b0d input=81e330492d57488e]*/
 
 /* static objects at module-level */
-PyObject* _pysqlite_converters = NULL;
 int _pysqlite_enable_callback_tracebacks = 0;
 int pysqlite_BaseTypeAdapted = 0;
 
@@ -197,7 +196,8 @@ pysqlite_register_converter_impl(PyObject *module, PyObject *orig_name,
         goto error;
     }
 
-    if (PyDict_SetItem(_pysqlite_converters, name, callable) != 0) {
+    pysqlite_state *state = pysqlite_get_state(module);
+    if (PyDict_SetItem(state->converters, name, callable) != 0) {
         goto error;
     }
 
@@ -246,15 +246,13 @@ pysqlite_adapt_impl(PyObject *module, PyObject *obj, PyObject *proto,
 
 static int converters_init(PyObject* module)
 {
-    _pysqlite_converters = PyDict_New();
-    if (!_pysqlite_converters) {
+    pysqlite_state *state = pysqlite_get_state(module);
+    state->converters = PyDict_New();
+    if (state->converters == NULL) {
         return -1;
     }
 
-    int res = PyModule_AddObjectRef(module, "converters", _pysqlite_converters);
-    Py_DECREF(_pysqlite_converters);
-
-    return res;
+    return PyModule_AddObjectRef(module, "converters", state->converters);
 }
 
 static int
diff --git a/Modules/_sqlite/module.h b/Modules/_sqlite/module.h
@@ -41,6 +41,12 @@ typedef struct {
     PyObject *ProgrammingError;
     PyObject *Warning;
 
+    /* A dictionary, mapping column types (INTEGER, VARCHAR, etc.) to converter
+     * functions, that convert the SQL value to the appropriate Python value.
+     * The key is uppercase.
+     */
+    PyObject *converters;
+
     PyObject *lru_cache;
 
     PyTypeObject *ConnectionType;
@@ -58,12 +64,6 @@ pysqlite_get_state(PyObject *Py_UNUSED(module))
     return &pysqlite_global_state;
 }
 
-/* A dictionary, mapping column types (INTEGER, VARCHAR, etc.) to converter
- * functions, that convert the SQL value to the appropriate Python value.
- * The key is uppercase.
- */
-extern PyObject* _pysqlite_converters;
-
 extern int _pysqlite_enable_callback_tracebacks;
 extern int pysqlite_BaseTypeAdapted;
 

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ _pysqlite_get_converter(const char *keystr, Py_ssize_t keylen)`
`147`	`147`	`return NULL;`
`148`	`148`	`}`
`149`	`149`
`150`		`- retval = PyDict_GetItemWithError(_pysqlite_converters, upcase_key);`
	`150`	`+ pysqlite_state *state = pysqlite_get_state(NULL);`
	`151`	`+ retval = PyDict_GetItemWithError(state->converters, upcase_key);`
`151`	`152`	`Py_DECREF(upcase_key);`
`152`	`153`
`153`	`154`	`return retval;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,6 @@ module _sqlite3`
`42`	`42`	`/[clinic end generated code: output=da39a3ee5e6b4b0d input=81e330492d57488e]/`
`43`	`43`
`44`	`44`	`/* static objects at module-level */`
`45`		`-PyObject* _pysqlite_converters = NULL;`
`46`	`45`	`int _pysqlite_enable_callback_tracebacks = 0;`
`47`	`46`	`int pysqlite_BaseTypeAdapted = 0;`
`48`	`47`
`@@ -197,7 +196,8 @@ pysqlite_register_converter_impl(PyObject module, PyObject orig_name,`
`197`	`196`	`goto error;`
`198`	`197`	`}`
`199`	`198`
`200`		`- if (PyDict_SetItem(_pysqlite_converters, name, callable) != 0) {`
	`199`	`+ pysqlite_state *state = pysqlite_get_state(module);`
	`200`	`+ if (PyDict_SetItem(state->converters, name, callable) != 0) {`
`201`	`201`	`goto error;`
`202`	`202`	`}`
`203`	`203`
`@@ -246,15 +246,13 @@ pysqlite_adapt_impl(PyObject module, PyObject obj, PyObject *proto,`
`246`	`246`
`247`	`247`	`static int converters_init(PyObject* module)`
`248`	`248`	`{`
`249`		`- _pysqlite_converters = PyDict_New();`
`250`		`- if (!_pysqlite_converters) {`
	`249`	`+ pysqlite_state *state = pysqlite_get_state(module);`
	`250`	`+ state->converters = PyDict_New();`
	`251`	`+ if (state->converters == NULL) {`
`251`	`252`	`return -1;`
`252`	`253`	`}`
`253`	`254`
`254`		`- int res = PyModule_AddObjectRef(module, "converters", _pysqlite_converters);`
`255`		`- Py_DECREF(_pysqlite_converters);`
`256`		`-`
`257`		`- return res;`
	`255`	`+ return PyModule_AddObjectRef(module, "converters", state->converters);`
`258`	`256`	`}`
`259`	`257`
`260`	`258`	`static int`