Skip to content

gh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives (in Modules/) #102196

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
iritkatriel merged 20 commits into from
Feb 24, 2023
Merged

gh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives (in Modules/) #102196

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ca94282
Modules/signalmodule.c
iritkatriel Feb 23, 2023
6271ef2
Modules/socketmodule.c
iritkatriel Feb 23, 2023
05c1448
Modules/_sqlite/cursor.c
iritkatriel Feb 23, 2023
0bda502
Modules/_zoneinfo.c
iritkatriel Feb 23, 2023
c7ce7f6
Modules/_sqlite/connection.c
iritkatriel Feb 23, 2023
f0d6478
Modules/_xxinterpchannelsmodule.c
iritkatriel Feb 23, 2023
e6e1fea
Modules/posixmodule.c
iritkatriel Feb 23, 2023
3cb6039
Modules/_lsprof.c
iritkatriel Feb 23, 2023
0653e47
Modules/_io/_iomodule.c
iritkatriel Feb 23, 2023
1bb5954
Modules/_io/iobase.c
iritkatriel Feb 23, 2023
0c93e72
Modules/_asynciomodule.c
iritkatriel Feb 24, 2023
c1f1f49
Modules/_io/bufferedio.c
iritkatriel Feb 24, 2023
6157ce8
Modules/_io/fileio.c
iritkatriel Feb 24, 2023
05b2833
Modules/_io/textio.c
iritkatriel Feb 24, 2023
15e3964
Modules/_io/winconsoleio.c
iritkatriel Feb 24, 2023
3064f2d
Modules/_testcapi/heaptype.c
iritkatriel Feb 24, 2023
a160b6a
Modules/_testcapi/watchers.c
iritkatriel Feb 24, 2023
04985db
Modules/_testcapimodule.c
iritkatriel Feb 24, 2023
6798b05
Merge branch 'main' into fetch-restore-modules
iritkatriel Feb 24, 2023
0ed7ef3
Merge branch 'main' into fetch-restore-modules
iritkatriel Feb 24, 2023
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
Modules/_sqlite/connection.c
  • Loading branch information
@iritkatriel
iritkatriel committed Feb 24, 2023
commit c7ce7f69107370785e31a4fcb07c840dd47c3374
14 changes: 6 additions & 8 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,6 @@ final_callback(sqlite3_context *context)
PyObject* function_result;
PyObject** aggregate_instance;
int ok;
PyObject *exception, *value, *tb;

aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, 0);
if (aggregate_instance == NULL) {
Expand All @@ -923,7 +922,7 @@ final_callback(sqlite3_context *context)
}

// Keep the exception (if any) of the last call to step, value, or inverse
PyErr_Fetch(&exception, &value, &tb);
PyObject *exc = PyErr_GetRaisedException();

callback_context *ctx = (callback_context *)sqlite3_user_data(context);
assert(ctx != NULL);
Expand All @@ -938,7 +937,7 @@ final_callback(sqlite3_context *context)
}
if (!ok) {
int attr_err = PyErr_ExceptionMatches(PyExc_AttributeError);
_PyErr_ChainExceptions(exception, value, tb);
_PyErr_ChainExceptions1(exc);

/* Note: contrary to the step, value, and inverse callbacks, SQLite
* does _not_, as of SQLite 3.38.0, propagate errors to sqlite3_step()
Expand All @@ -949,7 +948,7 @@ final_callback(sqlite3_context *context)
: "user-defined aggregate's 'finalize' method raised error");
}
else {
PyErr_Restore(exception, value, tb);
PyErr_SetRaisedException(exc);
}

error:
Expand Down Expand Up @@ -2274,15 +2273,14 @@ pysqlite_connection_exit_impl(pysqlite_Connection *self, PyObject *exc_type,
if (commit) {
/* Commit failed; try to rollback in order to unlock the database.
* If rollback also fails, chain the exceptions. */
PyObject *exc, *val, *tb;
PyErr_Fetch(&exc, &val, &tb);
PyObject *exc = PyErr_GetRaisedException();
result = pysqlite_connection_rollback_impl(self);
if (result == NULL) {
_PyErr_ChainExceptions(exc, val, tb);
_PyErr_ChainExceptions1(exc);
}
else {
Py_DECREF(result);
PyErr_Restore(exc, val, tb);
PyErr_SetRaisedException(exc);
}
}
return NULL;
Expand Down