FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix memory leak and Inserttable batch by justinpryzby · Pull Request #92 · PyGreSQL/PyGreSQL · GitHub

/ PyGreSQL Public

fix memory leak and Inserttable batch #92

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
Cito merged 2 commits into from
Jan 25, 2026
Conversation 0 Commits 2 Checks 15 Files changed
Merged

fix memory leak and Inserttable batch #92

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5092956
WIP: avoid memory leak in error cases..
Jan 4, 2026
cd5d912
WIP: optimize inserttable by batching rows
Jan 4, 2026
File filter

Filter by extension

Filter by extension .c  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
50 changes: 33 additions & 17 deletions ext/pgconn.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,8 @@ conn_inserttable(connObject *self, PyObject *args, PyObject *kwds)
Py_END_ALLOW_THREADS

if (!result || PQresultStatus(result) != PGRES_COPY_IN) {
if (result)
PQclear(result);
PyMem_Free(buffer.data);
Py_DECREF(iter_row);
PyErr_SetString(PyExc_ValueError, PQerrorMessage(self->cnx));
Expand All @@ -864,6 +866,9 @@ conn_inserttable(connObject *self, PyObject *args, PyObject *kwds)

PQclear(result);

/* empty buffer while keeping allocated memory */
buffer.size = 0;

/* feed table */
for (i = 0; m < 0 || i < m; ++i) {
if (!(columns = PyIter_Next(iter_row)))
Expand Down Expand Up @@ -895,9 +900,6 @@ conn_inserttable(connObject *self, PyObject *args, PyObject *kwds)
return NULL;
}

/* empty buffer while keeping allocated memory */
buffer.size = 0;

/* build insert line */

for (j = 0; j < n; ++j) {
Expand Down Expand Up @@ -1026,35 +1028,49 @@ conn_inserttable(connObject *self, PyObject *args, PyObject *kwds)
return PyErr_NoMemory();
}

/* send data */
ret = PQputCopyData(self->cnx, buffer.data, (int)buffer.size);
if (ret != 1) {
char *errormsg = ret == -1 ? PQerrorMessage(self->cnx)
: "Data cannot be queued";
PyErr_SetString(PyExc_IOError, errormsg);
PQputCopyEnd(self->cnx, errormsg);
PyMem_Free(buffer.data);
Py_DECREF(iter_row);
return NULL;
if (buffer.size > 128 * 1024) {
/* send buffered data */
ret = PQputCopyData(self->cnx, buffer.data, (int)buffer.size);
buffer.size = 0;
if (ret != 1) {
char *errormsg = ret == -1 ? PQerrorMessage(self->cnx)
: "Data cannot be queued";
PyErr_SetString(PyExc_IOError, errormsg);
PQputCopyEnd(self->cnx, errormsg);
PyMem_Free(buffer.data);
Py_DECREF(iter_row);
return NULL;
}
}
}

/* flush any remaining data */
// XXX: if buffer.size
ret = PQputCopyData(self->cnx, buffer.data, (int)buffer.size);
if (ret != 1) {
char *errormsg =
ret == -1 ? PQerrorMessage(self->cnx) : "Data cannot be queued";
PyErr_SetString(PyExc_IOError, errormsg);
PQputCopyEnd(self->cnx, errormsg);
PyMem_Free(buffer.data);
Py_DECREF(iter_row);
return NULL;
}

PyMem_Free(buffer.data);

Py_DECREF(iter_row);
if (PyErr_Occurred()) {
PyMem_Free(buffer.data);
return NULL; /* pass the iteration error */
}

ret = PQputCopyEnd(self->cnx, NULL);
if (ret != 1) {
PyErr_SetString(PyExc_IOError, ret == -1 ? PQerrorMessage(self->cnx)
: "Data cannot be queued");
PyMem_Free(buffer.data);
return NULL;
}

PyMem_Free(buffer.data);

Py_BEGIN_ALLOW_THREADS
result = PQgetResult(self->cnx);
Py_END_ALLOW_THREADS
Expand Down
Back | FazBrowse Home | New Git URL