Visitar URL original
bpo-45243: Add support for setting/getting `sqlite3` connection limits by erlend-aasland · Pull Request #28463 · python/cpython · GitHub
Skip to content

bpo-45243: Add support for setting/getting sqlite3 connection limits #28463

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 16 commits into from
Nov 1, 2021
Merged

bpo-45243: Add support for setting/getting sqlite3 connection limits #28463

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
39d69ce
bpo-45243: Add support for setting/getting sqlite3 connection limits
Sep 19, 2021
6fd1c74
Add docs
Sep 19, 2021
3514179
Add NEWS
Sep 19, 2021
c5abeb0
Add What's New
Sep 19, 2021
76d2c2b
SQLITE_LIMIT_WORKER_THREADS appeared in SQLite 3.8.7
Sep 19, 2021
2373a95
Merge branch 'main' into sqlite-limits
Oct 6, 2021
a51f286
Remove debug print
Oct 7, 2021
e093a99
Raise ProgrammingError if limit is out of bounds
Oct 7, 2021
fced0ce
SQLITE_LIMIT_WORKER_THREADS is defined in SQLite 3.8.7, not 3.8.3
Oct 7, 2021
4f7c2c0
SQLite version is found in sqlite3.sqlite_version_info, not sqlite3.v…
Oct 7, 2021
5e2ae97
Improve argument spec
Oct 8, 2021
1c36d95
Drop 'Non-standard' from docstring
Oct 8, 2021
eb6c233
Expand test suite
Oct 21, 2021
c1d828f
Merge branch 'main' into sqlite-limits
Oct 21, 2021
28b514a
Merge branch 'main' into sqlite-limits
Oct 31, 2021
872f1ef
Merge branch 'main' into sqlite-limits
Nov 1, 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
Drop 'Non-standard' from docstring
  • Loading branch information
Erlend E. Aasland
Erlend E. Aasland committed Oct 8, 2021
commit 1c36d9580d87a06e876dd27a21589cdba6fd952e
6 changes: 3 additions & 3 deletions Modules/_sqlite/clinic/connection.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ PyDoc_STRVAR(setlimit__doc__,
"setlimit($self, category, limit, /)\n"
"--\n"
"\n"
"Set connection run-time limits. Non-standard.\n"
"Set connection run-time limits.\n"
"\n"
" category\n"
" The limit category to be set.\n"
Expand Down Expand Up @@ -862,7 +862,7 @@ PyDoc_STRVAR(getlimit__doc__,
"getlimit($self, category, /)\n"
"--\n"
"\n"
"Get connection run-time limits. Non-standard.\n"
"Get connection run-time limits.\n"
"\n"
" category\n"
" The limit category to be queried.");
Expand Down Expand Up @@ -896,4 +896,4 @@ getlimit(pysqlite_Connection *self, PyObject *arg)
#ifndef PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
#define PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF
#endif /* !defined(PYSQLITE_CONNECTION_LOAD_EXTENSION_METHODDEF) */
/*[clinic end generated code: output=ef576e9b40005272 input=a9049054013a1b77]*/
/*[clinic end generated code: output=4d0ff26c99e22885 input=a9049054013a1b77]*/
8 changes: 4 additions & 4 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1876,7 +1876,7 @@ _sqlite3.Connection.setlimit as setlimit
unchanged.
/

Set connection run-time limits. Non-standard.
Set connection run-time limits.

Attempts to increase a limit above its hard upper bound are silently truncated
to the hard upper bound. Regardless of whether or not the limit was changed,
Expand All @@ -1885,7 +1885,7 @@ the prior value of the limit is returned.

static PyObject *
setlimit_impl(pysqlite_Connection *self, int category, int limit)
/*[clinic end generated code: output=0d208213f8d68ccd input=9d3a8e83f4cc32d7]*/
/*[clinic end generated code: output=0d208213f8d68ccd input=9bd469537e195635]*/
{
if (!pysqlite_check_thread(self) || !pysqlite_check_connection(self)) {
return NULL;
Expand All @@ -1906,12 +1906,12 @@ _sqlite3.Connection.getlimit as getlimit
The limit category to be queried.
/

Get connection run-time limits. Non-standard.
Get connection run-time limits.
[clinic start generated code]*/

static PyObject *
getlimit_impl(pysqlite_Connection *self, int category)
/*[clinic end generated code: output=7c3f5d11f24cecb1 input=788e5fb4e2d2b618]*/
/*[clinic end generated code: output=7c3f5d11f24cecb1 input=61e0849fb4fb058f]*/
{
return setlimit_impl(self, category, -1);
}
Expand Down