ext/pdo: Refactor PDO::FETCH_CLASS to not rely on a FCI and use a HashTable for ctor_arg #17427
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
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
3 times, most recently
from
702f741 to
2bad75c
Compare
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
2bad75c to
81490b2
Compare
nielsdos
requested changes
Jan 17, 2025
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
81490b2 to
5711354
Compare
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
5711354 to
808b10e
Compare
nielsdos
reviewed
Jan 19, 2025
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
808b10e to
4791772
Compare
nielsdos
requested changes
Jan 24, 2025
ext/pdo/pdo_stmt.c
Outdated
| zval_ptr_dtor(return_value); | ||
| RETVAL_FALSE; |
There was a problem hiding this comment.
Okay let's just make it consistently not use it then as it's a big refactor anyway it seems like a good opportunity to do so.
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
4791772 to
83b8a92
Compare
nielsdos
requested changes
Jan 25, 2025
nielsdos
requested changes
Jan 26, 2025
nielsdos
requested changes
Jan 26, 2025
ext/pdo/pdo_stmt.c
Outdated
| } | ||
| } else if (default_fetch_mode == PDO_FETCH_CLASS) { | ||
| if (stmt->fetch.cls.ctor_args != NULL) { | ||
| zend_hash_release(stmt->fetch.cls.ctor_args); |
There was a problem hiding this comment.
This can be:
Suggested change
| zend_hash_release(stmt->fetch.cls.ctor_args); | |
| zend_array_release(stmt->fetch.cls.ctor_args); |
as they're real arrays, not storing any persistent or non-zval stuff
There was a problem hiding this comment.
Also: can ctor_args be cyclic? If so, then this is not enough
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
1a63e7b to
1c52e37
Compare
nielsdos
requested changes
Jan 29, 2025
nielsdos
approved these changes
Jan 30, 2025
…hTable for ctor_arg To call the constructor we now only store the CE and a HashTable for the arguments. This reduces the size of the _pdo_stmt_t struct from 320 bytes to 232 bytes. Moreover, this now means that the constructor argument array follows the usual CUFA semantics. This change is a BC break, as string keys now act like named arguments. Moreover, the automatic wrapping of by-value arguments for by-ref parameters has been dropped, and the usual E_WARNING is now emitted in those cases. The do_fetch() is heavily refactored to simplify the execution flow, which also makes it easier to understand. Additionally we add a new bitflag in_fetch to prevent modification of the fetch flags by userland when PDO is fetching from the DB.
Girgias
force-pushed
the
pdo-stmt-remove-fci-usage
branch
from
08342ff to
441f9de
Compare
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.
Commits should be reviewed in order.
This removes the last usage of
zend_fcall_info_args_ex()and basically supersedes #9725, which would allow merging #9723.This also aligns the behaviour of the
ctor_argumentsto be have like CUFA.Some follow-up ideas: