Free buffer early when converting numerics #2456
Merged
Conversation
This file contains 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
Signed-off-by: Alex Kasko <alex@staticlibs.net>
Pull Request Test Coverage Report for Build 8554170845Warning: This coverage report may be inaccurate.This pull request's base commit is no longer the HEAD commit of its target branch. This means it includes changes from outside the original pull request, including, potentially, unrelated coverage changes.
Details
💛 - Coveralls |
Deepesh125
requested changes
Apr 4, 2024
| @@ -1189,6 +1192,7 @@ TdsTypeNumericToDatum(StringInfo buf, int scale) | |||
| decString++; | |||
|
|
|||
| res = TdsSetVarFromStrWrapper(decString); | |||
| pfree(decStringOrig); | |||
There was a problem hiding this comment.
- I couldn't add comment above, but we should free memory allocated to zeros on line no. 1153
- Just to safer side and to avoid double free, use if (decStringOrig) then free
There was a problem hiding this comment.
I think there is no chance that decStringOrig is going to be NULL here
There was a problem hiding this comment.
Added memory free call to zeros buffer. Agree about the NULL checks before calling pfree, just in this case decStringOrig should not be NULL on any code path.
Signed-off-by: Alex Kasko <alex@staticlibs.net>
Deepesh125
approved these changes
Apr 5, 2024
|
We should fix this in other dev branches also, BABEL_2_X_DEV and BABEL_3_X_DEV |
This was referenced Apr 6, 2024
|
Thanks for the review! I've filed PRs for 3x and 2x. |
KushaalShroff
approved these changes
Apr 8, 2024
|
Related Jira: BABEL-4882 |
shardgupta
merged commit 3d2354e
into
babelfish-for-postgresql:BABEL_4_X_DEV
40 checks passed
staticlibs
added a commit
to wiltondb/babelfish_extensions
that referenced
this pull request
Apr 14, 2024
…2456) `TdsTypeNumericToDatum` [allocates a buffer](https://github.com/babelfish-for postgresql/babelfish_extensions/blob/6606b1118978477186869c3dddd2c6d85fcc6387/contrib/babelfishpg_tds/src/backend/tds/tdstypeio.c#L1133) for parsing incoming numeric data, but does not release this buffer. So it remains in `MessageContext` until the end of BCP import call. Proposed patch frees this buffer before exiting `TdsTypeNumericToDatum`. ### Issues Resolved babelfish-for-postgresql#2455, BABEL-4882 Signed-off-by: Alex Kasko <alex@staticlibs.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
TdsTypeNumericToDatumallocates a buffer for parsing incoming numeric data, but does not release this buffer. So it remains inMessageContextuntil the end of BCP import call.Proposed patch frees this buffer before exiting
TdsTypeNumericToDatum.Backend memory usage when importing 1 million decimals (see details in linked issue) without the patch:
With patch applied:
Issues Resolved
#2455
Test Scenarios Covered
There are no functional changes, so no new tests.
Check List
By submitting this pull request, I confirm that my contribution is under the terms of the Apache 2.0 and PostgreSQL licenses, and grant any person obtaining a copy of the contribution permission to relicense all or a portion of my contribution to the PostgreSQL License solely to contribute all or a portion of my contribution to the PostgreSQL open source project.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.
Signed-off-by: Alex Kasko alex@staticlibs.net