Skip to content

Minor cleanup and performance improvement in pgsql #20212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2025
+70 −107
Merged

Minor cleanup and performance improvement in pgsql #20212

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf7ac36
pgsql: Use cheaper string conversion functions
nielsdos Oct 18, 2025
5566ac4
pgsql: Simplify pgsql_copy_from_query() by using character buffers
nielsdos Oct 18, 2025
bce177b
pgsql: Avoid unnecessary work in pgsql_copy_from_query() if the input…
nielsdos Oct 18, 2025
649e48f
pgsql: Avoid duplicating strings and factor out parameter building code
nielsdos Oct 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
177 changes: 70 additions & 107 deletions ext/pgsql/pgsql.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,26 +1223,55 @@ PHP_FUNCTION(pg_query)
}
}

static void _php_pgsql_free_params(char **params, int num_params)
/* The char pointer MUST refer to the char* of a zend_string struct */
static void php_pgsql_zend_string_release_from_char_pointer(char *ptr) {
zend_string_release((zend_string*) (ptr - XtOffsetOf(zend_string, val)));
}

static void _php_pgsql_free_params(char **params, uint32_t num_params)
{
int i;
for (i = 0; i < num_params; i++) {
for (uint32_t i = 0; i < num_params; i++) {
if (params[i]) {
efree(params[i]);
php_pgsql_zend_string_release_from_char_pointer(params[i]);
}
}
efree(params);
}

static char **php_pgsql_make_arguments(const HashTable *param_arr, int *num_params)
{
/* This conversion is safe because of the limit of number of elements in a table. */
*num_params = (int) zend_hash_num_elements(param_arr);
char **params = safe_emalloc(sizeof(char *), *num_params, 0);
uint32_t i = 0;

ZEND_HASH_FOREACH_VAL(param_arr, zval *tmp) {
ZVAL_DEREF(tmp);
if (Z_TYPE_P(tmp) == IS_NULL) {
params[i] = NULL;
} else {
zend_string *param_str = zval_try_get_string(tmp);
if (!param_str) {
_php_pgsql_free_params(params, i);
return NULL;
}
params[i] = ZSTR_VAL(param_str);
}
i++;
} ZEND_HASH_FOREACH_END();

return params;
}

/* Execute a query */
PHP_FUNCTION(pg_query_params)
{
zval *pgsql_link = NULL;
zval *pv_param_arr, *tmp;
zval *pv_param_arr;
char *query;
size_t query_len;
bool leftover = false;
int num_params = 0;
int num_params;
char **params = NULL;
pgsql_link_handle *link;
PGconn *pgsql;
Expand Down Expand Up @@ -1286,26 +1315,9 @@ PHP_FUNCTION(pg_query_params)
php_error_docref(NULL, E_NOTICE, "Found results on this connection. Use pg_get_result() to get these results first");
}

num_params = zend_hash_num_elements(Z_ARRVAL_P(pv_param_arr));
if (num_params > 0) {
int i = 0;
params = (char **)safe_emalloc(sizeof(char *), num_params, 0);

ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pv_param_arr), tmp) {
ZVAL_DEREF(tmp);
if (Z_TYPE_P(tmp) == IS_NULL) {
params[i] = NULL;
} else {
zend_string *param_str = zval_try_get_string(tmp);
if (!param_str) {
_php_pgsql_free_params(params, i);
RETURN_THROWS();
}
params[i] = estrndup(ZSTR_VAL(param_str), ZSTR_LEN(param_str));
zend_string_release(param_str);
}
i++;
} ZEND_HASH_FOREACH_END();
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}

pgsql_result = PQexecParams(pgsql, query, num_params,
Expand Down Expand Up @@ -1440,11 +1452,11 @@ PHP_FUNCTION(pg_prepare)
PHP_FUNCTION(pg_execute)
{
zval *pgsql_link = NULL;
zval *pv_param_arr, *tmp;
zval *pv_param_arr;
char *stmtname;
size_t stmtname_len;
bool leftover = false;
int num_params = 0;
int num_params;
char **params = NULL;
PGconn *pgsql;
pgsql_link_handle *link;
Expand Down Expand Up @@ -1488,25 +1500,9 @@ PHP_FUNCTION(pg_execute)
php_error_docref(NULL, E_NOTICE, "Found results on this connection. Use pg_get_result() to get these results first");
}

num_params = zend_hash_num_elements(Z_ARRVAL_P(pv_param_arr));
if (num_params > 0) {
int i = 0;
params = (char **)safe_emalloc(sizeof(char *), num_params, 0);

ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pv_param_arr), tmp) {
ZVAL_DEREF(tmp);
if (Z_TYPE_P(tmp) == IS_NULL) {
params[i] = NULL;
} else {
zend_string *tmp_str;
zend_string *str = zval_get_tmp_string(tmp, &tmp_str);

params[i] = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
zend_tmp_string_release(tmp_str);
}

i++;
} ZEND_HASH_FOREACH_END();
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}

pgsql_result = PQexecPrepared(pgsql, stmtname, num_params,
Expand Down Expand Up @@ -3409,26 +3405,27 @@ PHP_FUNCTION(pg_copy_to)

static zend_result pgsql_copy_from_query(PGconn *pgsql, PGresult *pgsql_result, zval *value)
{
zend_string *tmp = zval_try_get_string(value);
zend_string *tmp_tmp;
zend_string *tmp = zval_try_get_tmp_string(value, &tmp_tmp);
if (UNEXPECTED(!tmp)) {
return FAILURE;
}
zend_string *zquery = zend_string_alloc(ZSTR_LEN(tmp) + 2, false);
memcpy(ZSTR_VAL(zquery), ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 1);
ZSTR_LEN(zquery) = ZSTR_LEN(tmp);
if (ZSTR_LEN(tmp) > 0 && ZSTR_VAL(zquery)[ZSTR_LEN(tmp) - 1] != '\n') {
ZSTR_VAL(zquery)[ZSTR_LEN(tmp)] = '\n';
ZSTR_VAL(zquery)[ZSTR_LEN(tmp) + 1] = '\0';
ZSTR_LEN(zquery) ++;
}
if (PQputCopyData(pgsql, ZSTR_VAL(zquery), ZSTR_LEN(zquery)) != 1) {
zend_string_release_ex(zquery, false);
zend_string_release(tmp);
return FAILURE;

int result;
if (ZSTR_LEN(tmp) > 0 && ZSTR_VAL(tmp)[ZSTR_LEN(tmp) - 1] != '\n') {
char *zquery = emalloc(ZSTR_LEN(tmp) + 2);
memcpy(zquery, ZSTR_VAL(tmp), ZSTR_LEN(tmp) + 1);
zquery[ZSTR_LEN(tmp)] = '\n';
zquery[ZSTR_LEN(tmp) + 1] = '\0';
result = PQputCopyData(pgsql, zquery, ZSTR_LEN(tmp) + 1);
efree(zquery);
} else {
result = PQputCopyData(pgsql, ZSTR_VAL(tmp), ZSTR_LEN(tmp));
}
zend_string_release_ex(zquery, false);
zend_string_release(tmp);
return SUCCESS;

zend_tmp_string_release(tmp_tmp);

return result != 1 ? FAILURE : SUCCESS;
}

/* {{{ Copy table from array */
Expand Down Expand Up @@ -4033,9 +4030,9 @@ PHP_FUNCTION(pg_send_query)
/* {{{ Send asynchronous parameterized query */
PHP_FUNCTION(pg_send_query_params)
{
zval *pgsql_link, *pv_param_arr, *tmp;
zval *pgsql_link, *pv_param_arr;
pgsql_link_handle *link;
int num_params = 0;
int num_params;
char **params = NULL;
char *query;
size_t query_len;
Expand Down Expand Up @@ -4065,25 +4062,9 @@ PHP_FUNCTION(pg_send_query_params)
"There are results on this connection. Call pg_get_result() until it returns FALSE");
}

num_params = zend_hash_num_elements(Z_ARRVAL_P(pv_param_arr));
if (num_params > 0) {
int i = 0;
params = (char **)safe_emalloc(sizeof(char *), num_params, 0);

ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pv_param_arr), tmp) {
ZVAL_DEREF(tmp);
if (Z_TYPE_P(tmp) == IS_NULL) {
params[i] = NULL;
} else {
zend_string *tmp_str;
zend_string *str = zval_get_tmp_string(tmp, &tmp_str);

params[i] = estrndup(ZSTR_VAL(str), ZSTR_LEN(str));
zend_tmp_string_release(tmp_str);
}

i++;
} ZEND_HASH_FOREACH_END();
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}

if (PQsendQueryParams(pgsql, query, num_params, NULL, (const char * const *)params, NULL, NULL, 0)) {
Expand Down Expand Up @@ -4205,8 +4186,8 @@ PHP_FUNCTION(pg_send_execute)
{
zval *pgsql_link;
pgsql_link_handle *link;
zval *pv_param_arr, *tmp;
int num_params = 0;
zval *pv_param_arr;
int num_params;
char **params = NULL;
char *stmtname;
size_t stmtname_len;
Expand Down Expand Up @@ -4236,27 +4217,9 @@ PHP_FUNCTION(pg_send_execute)
"There are results on this connection. Call pg_get_result() until it returns FALSE");
}

num_params = zend_hash_num_elements(Z_ARRVAL_P(pv_param_arr));
if (num_params > 0) {
int i = 0;
params = (char **)safe_emalloc(sizeof(char *), num_params, 0);

ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(pv_param_arr), tmp) {
ZVAL_DEREF(tmp);
if (Z_TYPE_P(tmp) == IS_NULL) {
params[i] = NULL;
} else {
zend_string *tmp_str = zval_try_get_string(tmp);
if (UNEXPECTED(!tmp_str)) {
_php_pgsql_free_params(params, i);
return;
}
params[i] = estrndup(ZSTR_VAL(tmp_str), ZSTR_LEN(tmp_str));
zend_string_release(tmp_str);
}

i++;
} ZEND_HASH_FOREACH_END();
params = php_pgsql_make_arguments(Z_ARRVAL_P(pv_param_arr), &num_params);
if (UNEXPECTED(!params)) {
RETURN_THROWS();
}

if (PQsendQueryPrepared(pgsql, stmtname, num_params, (const char * const *)params, NULL, NULL, 0)) {
Expand Down