Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 15:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

gh-129813, PEP 782: Use PyBytesWriter in _sqlite (#138956)

Browse source 
Replace PyBytes_FromStringAndSize(NULL, size) with the new public
PyBytesWriter API.
This commit is contained in:
Victor Stinner 2025-09-18 13:58:35 +01:00 • committed by GitHub
parent 6504f20cce
commit 243d599a05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Modules/_sqlite/blob.c
View file

@ -143,23 +143,23 @@ read_multiple(pysqlite_Blob *self, Py_ssize_t length, Py_ssize_t offset)
assert(length <= sqlite3_blob_bytes(self->blob)); assert(length <= sqlite3_blob_bytes(self->blob));
assert(offset < sqlite3_blob_bytes(self->blob)); assert(offset < sqlite3_blob_bytes(self->blob));
PyObject *buffer = PyBytes_FromStringAndSize(NULL, length); PyBytesWriter *writer = PyBytesWriter_Create(length);
if (buffer == NULL) { if (writer == NULL) {
return NULL; return NULL;
} }
char *raw_buffer = PyBytesWriter_GetData(writer);
char *raw_buffer = PyBytes_AS_STRING(buffer);
int rc; int rc;
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
rc = sqlite3_blob_read(self->blob, raw_buffer, (int)length, (int)offset); rc = sqlite3_blob_read(self->blob, raw_buffer, (int)length, (int)offset);
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (rc != SQLITE_OK) { if (rc != SQLITE_OK) {
Py_DECREF(buffer); PyBytesWriter_Discard(writer);
blob_seterror(self, rc); blob_seterror(self, rc);
return NULL; return NULL;
} }
return buffer; return PyBytesWriter_Finish(writer);
} }
@ -196,7 +196,7 @@ blob_read_impl(pysqlite_Blob *self, int length)
assert(length >= 0); assert(length >= 0);
if (length == 0) { if (length == 0) {
return PyBytes_FromStringAndSize(NULL, 0); return Py_GetConstant(Py_CONSTANT_EMPTY_BYTES);
} }
PyObject *buffer = read_multiple(self, length, self->offset); PyObject *buffer = read_multiple(self, length, self->offset);
@ -440,20 +440,25 @@ subscript_slice(pysqlite_Blob *self, PyObject *item)
if (step == 1) { if (step == 1) {
return read_multiple(self, len, start); return read_multiple(self, len, start);
} }
PyObject *blob = read_multiple(self, stop - start, start); PyObject *blob = read_multiple(self, stop - start, start);
if (blob == NULL) { if (blob == NULL) {
return NULL; return NULL;
} }
PyObject *result = PyBytes_FromStringAndSize(NULL, len);
if (result != NULL) { PyBytesWriter *writer = PyBytesWriter_Create(len);
if (writer == NULL) {
Py_DECREF(blob);
return NULL;
}
char *res_buf = PyBytesWriter_GetData(writer);
char *blob_buf = PyBytes_AS_STRING(blob); char *blob_buf = PyBytes_AS_STRING(blob);
char *res_buf = PyBytes_AS_STRING(result);
for (Py_ssize_t i = 0, j = 0; i < len; i++, j += step) { for (Py_ssize_t i = 0, j = 0; i < len; i++, j += step) {
res_buf[i] = blob_buf[j]; res_buf[i] = blob_buf[j];
} }
Py_DECREF(blob); Py_DECREF(blob);
} return PyBytesWriter_Finish(writer);
return result;
} }
static PyObject * static PyObject *