Skip to content

bpo-43852: Improve tuple creation in sqlite3#25421

Merged
berkerpeksag merged 3 commits intopython:masterfrom
erlend-aasland:sqlite-harden-tuple-creation
Apr 23, 2021
Merged

bpo-43852: Improve tuple creation in sqlite3#25421
berkerpeksag merged 3 commits intopython:masterfrom
erlend-aasland:sqlite-harden-tuple-creation

Conversation

@erlend-aasland
Copy link
Copy Markdown
Contributor

@erlend-aasland erlend-aasland commented Apr 15, 2021 •
edited by bedevere-bot
Loading

  • Use PyTuple_SET_ITEM iso. PyTuple_SetItem
  • In _pysqlite_query_execute, minimise decref's in case of error

https://bugs.python.org/issue43852

@erlend-aasland
Copy link
Copy Markdown
Contributor Author

erlend-aasland commented Apr 15, 2021

skip news

@erlend-aasland erlend-aasland force-pushed the sqlite-harden-tuple-creation branch from cf6480b to cfbb0c5 Compare April 15, 2021 10:52
berkerpeksag
berkerpeksag requested changes Apr 15, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@berkerpeksag berkerpeksag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think the title of the PR is accurate. My understanding is that "harden tuple creation" would mean checking return value of each PyTuple_SetItem calls and Py_DECREF any objects if needed. This PR simply replaces PyTuple_SetItem calls with a macro that doesn't do any error checking. I'm fine with the PR as is, but I don't think it would harden tuple creation as it claimed.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Apr 15, 2021

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

And if you don't make the requested changes, you will be put in the comfy chair!

@erlend-aasland erlend-aasland changed the title bpo-43852: Harden tuple creation in sqlite3 bpo-43852: Improve tuple creation in sqlite3 Apr 15, 2021
@erlend-aasland
Copy link
Copy Markdown
Contributor Author

erlend-aasland commented Apr 15, 2021 •
edited
Loading

I don't think the title of the PR is accurate.

I agree. I started out adding error checking to PyTuple_SetItem, but soon decided using PyTuple_SET_ITEM was better. I changed the title from harden to improve. Ok?

EDIT
The building of the cursor description is actually hardened: PyTuple_SetItem without error checking has been traded with PyTuple_Pack with error checking.

Nitpick: I don't like the variable name descriptor. I would prefer description or descr.

@erlend-aasland
Copy link
Copy Markdown
Contributor Author

erlend-aasland commented Apr 15, 2021

Thanks for reviewing, @berkerpeksag! I have made the requested changes; please review again.

@bedevere-bot
Copy link
Copy Markdown

bedevere-bot commented Apr 15, 2021

Thanks for making the requested changes!

@berkerpeksag: please review the changes made to this pull request.

serhiy-storchaka
serhiy-storchaka approved these changes Apr 15, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the changes I hesitated to make.

@erlend-aasland
Copy link
Copy Markdown
Contributor Author

erlend-aasland commented Apr 15, 2021

Thank you for reviewing, @serhiy-storchaka !

@erlend-aasland
Copy link
Copy Markdown
Contributor Author

erlend-aasland commented Apr 21, 2021

Let me know if there are other changes you want me to address, @berkerpeksag.

@erlend-aasland
Copy link
Copy Markdown
Contributor Author

erlend-aasland commented Apr 23, 2021

Thanks for reviewing, @methane!

@berkerpeksag berkerpeksag merged commit e9194ea into python:master Apr 23, 2021
@berkerpeksag
Copy link
Copy Markdown
Member

berkerpeksag commented Apr 23, 2021

Thank you!

@erlend-aasland erlend-aasland deleted the sqlite-harden-tuple-creation branch April 23, 2021 11:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@berkerpeksag berkerpeksag berkerpeksag approved these changes

@methane methane methane approved these changes

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@erlend-aasland @bedevere-bot @berkerpeksag @methane @serhiy-storchaka @the-knights-who-say-ni