ext/pgsql: adding cache for the tables meta data. #11193
Conversation
This file contains hidden or 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
devnexen
force-pushed
the
psql_meta_data_cache
branch
4 times, most recently
from
6e2ee9a to
bda8f5e
Compare
|
cc @Girgias any guidance about how to fix those ? They are coming from the hash insertions, asan does not report anything but I can reproduce it locally. Cheers |
Girgias
reviewed
May 10, 2023
ext/pgsql/pgsql.c
Outdated
|
|
||
| tmp = (zval *)safe_emalloc(1, sizeof(zval), 0); | ||
| ZVAL_COPY(tmp, meta); | ||
| zend_hash_add(zmeta, (zend_string *)table_name, tmp); |
There was a problem hiding this comment.
Suggested change
| zend_hash_add(zmeta, (zend_string *)table_name, tmp); | |
| zend_hash_add(zmeta, table_name, tmp); |
There was a problem hiding this comment.
in fact locally I opted for the zend_hash_str* api to avoid this.
ext/pgsql/pgsql.c
Outdated
| @@ -4147,7 +4151,6 @@ PHP_FUNCTION(pg_flush) | |||
|
|
|||
| /* {{{ php_pgsql_meta_data | |||
| * table_name must not be empty | |||
| * TODO: Add meta_data cache for better performance | |||
| */ | |||
| PHP_PGSQL_API zend_result php_pgsql_meta_data(PGconn *pg_link, const zend_string *table_name, zval *meta, bool extended) | |||
There was a problem hiding this comment.
First let's drop the const qualifier, as the hash insertion is trying to increase the refcount of the zend_string (and also compute the hash on it).
Suggested change
| PHP_PGSQL_API zend_result php_pgsql_meta_data(PGconn *pg_link, const zend_string *table_name, zval *meta, bool extended) | |
| PHP_PGSQL_API zend_result php_pgsql_meta_data(PGconn *pg_link, zend_string *table_name, zval *meta, bool extended) |
There was a problem hiding this comment.
ah right, will look at it later.
devnexen
force-pushed
the
psql_meta_data_cache
branch
from
bda8f5e to
ed9a106
Compare
iluuu1994
reviewed
May 11, 2023
ext/pgsql/pgsql.c
Outdated
|
|
||
| tmp = (zval *)safe_emalloc(1, sizeof(zval), 0); | ||
| ZVAL_COPY(tmp, meta); | ||
| zend_hash_add(zmeta, table_name, tmp); |
There was a problem hiding this comment.
This leaks because meta here is still emalloced. You'd need to copy the entire array to "process-space" recursively. May I suggest making the cache request-bound? This problem goes away, along with potential cache-invalidation issues. Even with request-bound cache I'm wondering, if the table changes during the request (could be a CLI process) we'd need a way to clear the cache.
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.
No description provided.