speed-up SQLite3Result::fetchArray(SQLITE3_ASSOC) by caching column names #7505
Conversation
kaja47
force-pushed
the
sqlite-fetch-assoc
branch
from
3fe1b33 to
d8ecb68
Compare
ext/sqlite3/sqlite3.c
Outdated
| /* Cache column names to speed up repeated fetchArray calls. | ||
| * Names are deallocated in php_sqlite3_result_object_free_storage. */ | ||
| if (mode & PHP_SQLITE3_ASSOC && !result_obj->column_names) { | ||
| result_obj->column_names = pemalloc(n_cols * sizeof(zend_string*), 0); |
There was a problem hiding this comment.
| result_obj->column_names = pemalloc(n_cols * sizeof(zend_string*), 0); | |
| result_obj->column_names = emalloc(n_cols * sizeof(zend_string*)); |
ext/sqlite3/sqlite3.c
Outdated
| result_obj->column_names = pemalloc(n_cols * sizeof(zend_string*), 0); | ||
|
|
||
| for (int i = 0; i < n_cols; i++) { | ||
| const char* column = sqlite3_column_name(result_obj->stmt_obj->stmt, i); |
There was a problem hiding this comment.
| const char* column = sqlite3_column_name(result_obj->stmt_obj->stmt, i); | |
| const char *column = sqlite3_column_name(result_obj->stmt_obj->stmt, i); |
ext/sqlite3/php_sqlite3_structs.h
Outdated
| @@ -107,6 +107,9 @@ struct _php_sqlite3_result_object { | |||
| php_sqlite3_stmt *stmt_obj; | |||
| zval stmt_obj_zval; | |||
|
|
|||
| zend_long column_count; | |||
There was a problem hiding this comment.
| zend_long column_count; | |
| int column_count; |
To match type returned by sqlite.
|
Wouldn't that basically introduce https://bugs.php.net/bug.php?id=78227 for SQLite3? |
|
@cmb69 As this only caches for one execute, not one prepare, I don't think so. |
Ah, fine then. :) |
|
Well, that bug you mentioned was indeed introduced. In sqlite changed column names are visible only after sqlite3_reset() call (SQLite3Stmt::reset() on PHP side). Cache is now cleared also in this case. I added one test to make sure this is the case. |
| result_obj->column_count = sqlite3_column_count(result_obj->stmt_obj->stmt); | ||
| } | ||
|
|
||
| zend_long n_cols = result_obj->column_count; |
There was a problem hiding this comment.
| zend_long n_cols = result_obj->column_count; | |
| int n_cols = result_obj->column_count; |
| result->column_count = -1; | ||
| } | ||
|
|
||
|
|
|
|
||
| for (int i = 0; i < n_cols; i++) { | ||
| const char *column = sqlite3_column_name(result_obj->stmt_obj->stmt, i); | ||
| result_obj->column_names[i] = zend_string_init(column, strlen(column), 0); |
There was a problem hiding this comment.
You might want to check whether using zend_string_init_existing_interned() would be beneficial in practice (you'd have to measure that together with code using the data).
No description provided.