Skip to content

bpo-42972: Track sqlite3 statement objects - #26475

Merged
vstinner merged 5 commits into
python:mainfrom
erlend-aasland:sqlite-track-stmt
Jun 1, 2021
Merged

bpo-42972: Track sqlite3 statement objects#26475
vstinner merged 5 commits into
python:mainfrom
erlend-aasland:sqlite-track-stmt

Conversation

@erlend-aasland

@erlend-aaslanderlend-aasland commented May 31, 2021•
edited by bedevere-bot
Loading

Copy link
Copy Markdown
Contributor

@erlend-aasland

erlend-aasland commented May 31, 2021

Copy link
Copy Markdown
ContributorAuthor

cc. @vstinner

@erlend-aaslanderlend-aasland mentioned this pull request May 31, 2021
Closed
pablogsal
pablogsal requested changes May 31, 2021
View reviewed changes
Comment threadModules/_sqlite/cursor.c Outdated
@bedevere-bot

bedevere-bot commented May 31, 2021

Copy link
Copy Markdown

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.

Erlend E. Aasland added 2 commits June 1, 2021 09:26
Erlend E. Aasland
Allocate and track statement objects in pysqlite_statement_create
1b0f583
By allocating and tracking creation of statement object in
pysqlite_statement_create(), the caller does not need to worry about GC
syncronization, and eliminates the possibility of getting a badly
created object. All related fault handling is moved to
pysqlite_statement_create().
Erlend E. Aasland
Remove now unused constants
0a6ca75
vstinner
vstinner approved these changes Jun 1, 2021
View reviewed changes

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM, but I would like to see the minor issues being addressed first before merging your change.

Comment threadModules/_sqlite/statement.c Outdated
Comment threadModules/_sqlite/statement.c Outdated
Erlend Egeberg Aaslandand others added 2 commits June 1, 2021 12:13
Erlend Egeberg Aasland@vstinner
Improve error message
df284eb
Co-authored-by: Victor Stinner <vstinner@python.org>
Erlend E. Aasland
Group and order member initialisation
4f03b79
vstinner
vstinner approved these changes Jun 1, 2021
View reviewed changes

@vstinnervstinner left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM.

Comment threadModules/_sqlite/statement.c
@vstinner
vstinner merged commit fffa0f9 into python:mainJun 1, 2021
@vstinner

vstinner commented Jun 1, 2021

Copy link
Copy Markdown
Member

Merged, thanks.

@erlend-aasland
erlend-aasland deleted the sqlite-track-stmt branch June 1, 2021 10:51
@erlend-aasland

erlend-aasland commented Jun 1, 2021

Copy link
Copy Markdown
ContributorAuthor

Merged, thanks.

Thanks for reviewing, Victor & Pablo!

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jun 2, 2021
Erlend E. Aasland
pysqlite_statement_create now returns a Py object, not an int
448ad9d
pythonGH-26206 was broken by pythonGH-26475.
@erlend-aaslanderlend-aasland mentioned this pull request Jun 2, 2021
Merged
pablogsal pushed a commit that referenced this pull request Jun 2, 2021
Erlend Egeberg Aasland
bpo-44165: pysqlite_statement_create now returns a Py object, not an …
fbf25b8
…int (GH-26484)
GH-26206 was broken by GH-26475.
@MariattaMariatta added needs backport to 3.10 only security fixes and removed needs backport to 3.10 only security fixes labels Jun 2, 2021
@miss-islington

miss-islington commented Jun 2, 2021

Copy link
Copy Markdown
Contributor

Thanks @erlend-aasland for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10.
🐍🍒⛏🤖

@miss-islington

miss-islington commented Jun 2, 2021

Copy link
Copy Markdown
Contributor

Sorry, @erlend-aasland and @vstinner, I could not cleanly backport this to 3.10 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker fffa0f92adaaed0bcb3907d982506f78925e9052 3.10

@vstinner

vstinner commented Jun 2, 2021

Copy link
Copy Markdown
Member

@erlend-aasland: Automated backport to 3.10 failed, can you try to backport the change manually?

@pablogsal: I'm not sure if this change is really a bugfix or an enhancement. I'm ok to backport it even after beta2 release.

@erlend-aasland

erlend-aasland commented Jun 3, 2021

Copy link
Copy Markdown
ContributorAuthor

@erlend-aasland: Automated backport to 3.10 failed, can you try to backport the change manually?

Will do!

erlend-aasland pushed a commit to erlend-aasland/cpython that referenced this pull request Jun 3, 2021
Erlend Egeberg Aasland
[3.10] bpo-42972: Track sqlite3 statement objects (pythonGH-26475)
93f9a45
Allocate and track statement objects in pysqlite_statement_create.
By allocating and tracking creation of statement object in
pysqlite_statement_create(), the caller does not need to worry about GC
syncronization, and eliminates the possibility of getting a badly
created object. All related fault handling is moved to
pysqlite_statement_create().
Co-authored-by: Victor Stinner <vstinner@python.org>.
(cherry picked from commit fffa0f9)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@bedevere-botbedevere-bot removed the needs backport to 3.10 only security fixes label Jun 3, 2021
@bedevere-bot

bedevere-bot commented Jun 3, 2021

Copy link
Copy Markdown

GH-26515 is a backport of this pull request to the 3.10 branch.

vstinner pushed a commit that referenced this pull request Jun 3, 2021
Erlend Egeberg Aasland
[3.10]bpo-42972: Track sqlite3 statement objects (GH-26475) (GH-26515)
84d80f5
Allocate and track statement objects in pysqlite_statement_create.
By allocating and tracking creation of statement object in
pysqlite_statement_create(), the caller does not need to worry about GC
syncronization, and eliminates the possibility of getting a badly
created object. All related fault handling is moved to
pysqlite_statement_create().
Co-authored-by: Victor Stinner <vstinner@python.org>.
(cherry picked from commit fffa0f9)
Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
@pablogsalpablogsal mentioned this pull request Jul 18, 2021
Closed
@vstinnervstinner mentioned this pull request Jun 9, 2022
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsalpablogsalpablogsal requested changes
@vstinnervstinnervstinner approved these changes
@berkerpeksagberkerpeksagAwaiting requested review from berkerpeksag

Assignees

@vstinnervstinner

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@erlend-aasland@bedevere-bot@vstinner@miss-islington@pablogsal@Mariatta@the-knights-who-say-ni