-
Notifications
You must be signed in to change notification settings - Fork 564
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.
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
Bugfix/sql param data memory leak #703
Bugfix/sql param data memory leak #703
Conversation
I've posted a question to the issue. |
I have answered and changed the code, can you please take another look? |
Waiting for your response. |
Bring new master branch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reviewed my changes. Seems OK to me.
…ECREF the PyObject with 1 reference.
aa9c8b8
to
1290726
Compare
@mkleehammer – I've just had another look at this and using test code from time import time
import psutil
import pyodbc
print(f"pyodbc {pyodbc.version}")
cnxn = pyodbc.connect("DSN=mssqlLocal", autocommit=True)
process = psutil.Process()
def print_status(msg, t0=None):
s = f"{msg}: "
mb = process.memory_info().vms / 1048576
s += f"vms {mb:0.1f} MiB"
if t0:
s += f", {(time() - t0):0.1f} sec."
print(s)
print_status("startup")
num_chars = 10_000_000
data = (1, "x" * num_chars, "2012-02-31")
print_status("data loaded")
table_name = "pd_test"
col_names = ["id", "txt_col", "dtm_col"]
ins_sql = f"INSERT INTO {table_name} ({','.join(col_names)}) VALUES ({','.join('?' * len(col_names))})"
for iteration in range(5):
t0 = time()
crsr = cnxn.cursor()
crsr.execute(f"DROP TABLE IF EXISTS {table_name}")
crsr.execute(
f"CREATE TABLE {table_name} (id int, txt_col varchar(max), dtm_col datetime2)"
)
try:
crsr.execute(ins_sql, data)
except pyodbc.DataError:
# (Feb 31 is an invalid date)
pass
crsr.close()
print_status(f"iteration {iteration}", t0) with
and with
Can we merge this one now? |
@gordthompson Sorry for disappearing for a while. Is there something I can do to promote this PR? |
Was it decided that this is no longer needed because #832 fixes the leak? I'm not sure swapping the two free calls would make a difference as they are not coupled. |
@mkleehammer - #832 was merged by 716572a. When I run my test code above against the current master branch the leak is still there:
so this fixes a different leak. (This relates to .execute() while #832 was a fast_executemany issue.) |
I ran the test above with slight modifications for Linux & Postgres, from commit 4a7c583, and I'm not seeing any leaks. I'll have to test on my Windows laptop. I still don't see how swapping those two lines could affect anything. I'm concerned we don't actually know the cause. Note that it could be a bug in the driver, so we do need to track those versions too. |
@mkleehammer - FWIW, my test earlier today was also on Linux. Just tested again with PostgreSQL Unicode driver. Xubuntu 20.04, Python 3.8.10, unixODBC 2.3.7. from time import perf_counter
import psutil
import pyodbc
print(f"{pyodbc.version=}")
connection_string = (
"Driver=PostgreSQL Unicode;"
"Server=192.168.0.199;"
"Database=test;"
"UID=scott;PWD=tiger;"
)
cnxn = pyodbc.connect(connection_string, autocommit=True)
print(f"{cnxn.getinfo(pyodbc.SQL_DRIVER_NAME)=}")
print(f"{cnxn.getinfo(pyodbc.SQL_DRIVER_VER)=}")
process = psutil.Process()
def print_status(msg, t0=None):
s = f"{msg}: "
mb = process.memory_info().vms / 1048576
s += f"vms {mb:0.1f} MiB"
if t0:
s += f", {(perf_counter() - t0):0.1f} sec."
print(s)
print_status("startup")
num_chars = 10_000_000
data = (1, "x" * num_chars, "2012-02-31")
print_status("data loaded")
table_name = "pd_test"
col_names = ["id", "txt_col", "dtm_col"]
ins_sql = f"INSERT INTO {table_name} ({','.join(col_names)}) VALUES ({','.join('?' * len(col_names))})"
for iteration in range(5):
t0 = perf_counter()
crsr = cnxn.cursor()
crsr.execute(f"DROP TABLE IF EXISTS {table_name}")
crsr.execute(
f"CREATE TABLE {table_name} (id int, txt_col text, dtm_col timestamp)"
)
try:
crsr.execute(ins_sql, data)
except pyodbc.DataError:
# (Feb 31 is an invalid date)
pass
crsr.close()
print_status(f"iteration {iteration}") With current master (e67ad89):
With Mizaro's patch (850a8dd):
|
@mkleehammer This is a different issue, that maybe only looks alike. @gordthompson Thanks for retesting it! I appreciate it.
About how swapping those two lines can help.
We can also see my explanation here #702 (comment), Variable |
@mkleehammer, @gordthompson Is there a plan to merge this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me.
* Add support for Python 3.10, drop EOL 3.5 (mkleehammer#952) * Remove duplicate entry in pyi stub (mkleehammer#979) * Replace deprecated SafeConfigParser with ConfigParser (mkleehammer#953) * Designate connection string as optional (mkleehammer#987) * Fix spelling typos (mkleehammer#985) Co-authored-by: Gord Thompson <[email protected]> * Fix for DSN Names with non-ASCII chars (mkleehammer#951) * Fix for DSN Names with non-ASCII chars Fixes: mkleehammer#948 Co-authored-by: bamboo <[email protected]> Co-authored-by: Gord Thompson <[email protected]> * Added InterfaceError to pyodbc.pyi. (mkleehammer#1013) Co-authored-by: Benjamin Holder <[email protected]> * Upgrade deprecated unicode encoding calls (mkleehammer#792) * Do not include .pyc artifacts in source tarball mkleehammer#742 * Build wheels with cibuildwheels on GitHub Actions Fixes mkleehammer#175 Ref mkleehammer#688 Closes mkleehammer#668 Closes mkleehammer#685 Fixes mkleehammer#441 and pretty much most issues that mention ` sql.h: No such file or directory` This also need to setup some PyPI keys for automated uploads. * Install unixodbc-dev for Linux wheels * Enable GitHub Actions for pull requests * Use Debian based `manylinux_2_24` image * `apt-get` update before installing in wheel build * Use PEP 440 version name required for wheels * Skip building 32-bit wheels * 4.0.dev0 for default version, because test_version() wants 3 parts here Checked this won't shadow released minor version (credit goes to @hugovk) >>> from packaging.version import Version >>> Version("4.0.dev0") > Version("4.0.24") False * Had to use Debian image for PyPy too * Disable PyPy wheels https://cibuildwheel.readthedocs.io/en/stable/options/#build-selection PyPy is missing some C functions that `pyodbc` needs. * Update README.md * Avoid error when testing with DSN= connection Fixes: mkleehammer#1000 * Disable setencoding/setdecoding in tests3/pgtests.py Fixes: mkleehammer#1004 * Adjust test_columns() in tests3/pgtests.py for newer driver versions Fixes: mkleehammer#1003 * Move driver version check out of function * Add comment to _get_column_size() * Fix memory leak with decimal parameters Fixes: mkleehammer#1026 * Create codeql-analysis.yml * Bugfix/sql param data memory leak (mkleehammer#703) * Updated .gitignore * * Created a test file for the specific scenario * * Updated doc of test file for the specific SQLParamData scenario * * Fixed the test file for the specific SQLParamData scenario by Py_XDECREF the PyObject with 1 reference. * * Improved the test to close the cursor and set it to None, then forcing the gc * * Changed the fix of the memory leak and updated the test. * * Removed redundant empty line * * Converted tabs to spaces * * Moved variable out of conn's scope * Update gitignore, remove duplicated * Replace deprecated PyUnicode_FromUnicode(NULL, size) calls (mkleehammer#998) Current versions of Python write a deprecation warning message to stderr, which breaks CGI scripts running under web servers which fold stderr into stdout. Likely breaks other software. This change replaces the deprecated calls with PyUnicode_New(size, maxchar). The accompanying code to populate the new objects has also been rewritten to use the new PyUnicode APIs. * Making pyodbc compatible with PostgreSQL infinity dates, returning MINYEAR and MAXYEAR to python, instead of values out of python's limits * Removing autoformat from code * Removing autoformat from code * Add odbc_config support on mac and m1 homebrew dir * Note EOL of 2.7 support in README (mkleehammer#945) * Fix version of CI generated wheels The CI system is checking out exact tags like "git checkout 4.0.33", which results in a detached HEAD. The version calculation was adding the commit hash. * Fix for mkleehammer#1082 libraries in Linux wheels (mkleehammer#1084) * use argparse instead of optparse (mkleehammer#1089) Co-authored-by: Hugo van Kemenade <[email protected]> Co-authored-by: Alex Nelson <[email protected]> Co-authored-by: Kian Meng, Ang <[email protected]> Co-authored-by: Gord Thompson <[email protected]> Co-authored-by: bamboo <[email protected]> Co-authored-by: Gord Thompson <[email protected]> Co-authored-by: bdholder <[email protected]> Co-authored-by: Benjamin Holder <[email protected]> Co-authored-by: Inada Naoki <[email protected]> Co-authored-by: Michael Fladischer <[email protected]> Co-authored-by: Anatoli Babenia <[email protected]> Co-authored-by: Francisco Morales <[email protected]> Co-authored-by: Gord Thompson <[email protected]> Co-authored-by: Michael Kleehammer <[email protected]> Co-authored-by: Gilad Leifman <[email protected]> Co-authored-by: Bob Kline <[email protected]> Co-authored-by: Leandro Scott <[email protected]> Co-authored-by: Jordan Mendelson <[email protected]> Co-authored-by: Keith Erskine <[email protected]>
Fixing "Memory leak after getting [42000][ODBC Driver 17 for SQL Server] (1105) (SQLParamData) Error #702"