Skip to content

bpo-42862: Use functools.lru_cache iso. _sqlite.Cache in sqlite3 module #24203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pablogsal merged 18 commits into from
Jun 3, 2021
Merged

bpo-42862: Use functools.lru_cache iso. _sqlite.Cache in sqlite3 module #24203

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9c24ebc
Use functools.lru_cache iso. _sqlite.Cache/Node
Dec 26, 2020
0a8133a
Update documentation
Jan 12, 2021
7830f3b
Add tests
Jan 12, 2021
5c8e05c
Add NEWS
Jan 12, 2021
d2078bc
Fix tests on Windows
Jan 21, 2021
6c6a422
Tiny optimisation: increase the cache size from 100 to 128
May 2, 2021
2795aca
Move What's New to 3.11
May 14, 2021
05ce0e4
Address review: don't expose cache API
May 19, 2021
839f264
Remove empty line
May 19, 2021
8d1c138
Address review: document Windows test workaround
May 19, 2021
0067cef
Address review: check PyLong_FromLong ret value
May 19, 2021
a95a386
Address review: add global state and add LRU cache func to it
May 19, 2021
9882ebd
Fix rebase
May 25, 2021
150b3e7
Merge branch 'main' into sqlite-cache
May 29, 2021
5a4aacc
Revert test workaround
Jun 2, 2021
d1a233a
Merge branch 'main' into sqlite-cache
Jun 3, 2021
401b057
Improve naming: get_statement => get_statement_from_cache
Jun 3, 2021
dfb47a8
Remove spurious change in connection_dealloc
Jun 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address review: add global state and add LRU cache func to it
  • Loading branch information
Erlend E. Aasland committed May 25, 2021
commit a95a386adad9bce2e667ac23bac1beb69b2eae28
20 changes: 2 additions & 18 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,31 +56,15 @@ static const char * const begin_statements[] = {
static int pysqlite_connection_set_isolation_level(pysqlite_Connection* self, PyObject* isolation_level, void *Py_UNUSED(ignored));
static void _pysqlite_drop_unused_cursor_references(pysqlite_Connection* self);

static PyObject *_lru_cache = NULL;

int
load_functools_lru_cache(PyObject *Py_UNUSED(module))
{
PyObject *functools = PyImport_ImportModule("functools");
if (functools == NULL) {
return -1;
}
_lru_cache = PyObject_GetAttrString(functools, "lru_cache");
Py_DECREF(functools);
if (_lru_cache == NULL) {
return -1;
}
return 0;
}

static PyObject *
new_statement_cache(pysqlite_Connection *self, int maxsize)
{
PyObject *args[] = { PyLong_FromLong(maxsize), };
Comment thread
erlend-aasland marked this conversation as resolved.
Outdated
if (args[0] == NULL) {
return NULL;
}
PyObject *inner = PyObject_Vectorcall(_lru_cache, args, 1, NULL);
pysqlite_state *state = pysqlite_get_state(NULL);
PyObject *inner = PyObject_Vectorcall(state->lru_cache, args, 1, NULL);
Py_DECREF(args[0]);
if (inner == NULL) {
return NULL;
Expand Down
1 change: 0 additions & 1 deletion Modules/_sqlite/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,5 @@ int pysqlite_check_thread(pysqlite_Connection* self);
int pysqlite_check_connection(pysqlite_Connection* con);

int pysqlite_connection_setup_types(PyObject *module);
int load_functools_lru_cache(PyObject *module);

#endif
25 changes: 25 additions & 0 deletions Modules/_sqlite/module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ PyObject* _pysqlite_converters = NULL;
int _pysqlite_enable_callback_tracebacks = 0;
int pysqlite_BaseTypeAdapted = 0;

pysqlite_state pysqlite_global_state;

pysqlite_state *
pysqlite_get_state(PyObject *Py_UNUSED(module))
{
return &pysqlite_global_state;
}

static PyObject* module_connect(PyObject* self, PyObject* args, PyObject*
kwargs)
{
Expand Down Expand Up @@ -260,6 +268,23 @@ static int converters_init(PyObject* module)
return res;
}

static int
load_functools_lru_cache(PyObject *module)
{
PyObject *functools = PyImport_ImportModule("functools");
if (functools == NULL) {
return -1;
}

pysqlite_state *state = pysqlite_get_state(module);
state->lru_cache = PyObject_GetAttrString(functools, "lru_cache");
Py_DECREF(functools);
if (state->lru_cache == NULL) {
return -1;
}
return 0;
}

static PyMethodDef module_methods[] = {
{"connect", (PyCFunction)(void(*)(void))module_connect,
METH_VARARGS | METH_KEYWORDS, module_connect_doc},
Expand Down
6 changes: 6 additions & 0 deletions Modules/_sqlite/module.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
#define PYSQLITE_VERSION "2.6.0"
#define MODULE_NAME "sqlite3"

typedef struct {
PyObject *lru_cache;
} pysqlite_state;

extern pysqlite_state *pysqlite_get_state(PyObject *module);

extern PyObject* pysqlite_Error;
extern PyObject* pysqlite_Warning;
extern PyObject* pysqlite_InterfaceError;
Expand Down