mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-03-19 20:00:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for pg_restore_attribute_stats().

Browse Source 
Use RelationGetIndexExpressions() rather than rd_indexprs directly.

Author: Corey Huinker <corey.huinker@gmail.com>
This commit is contained in:
Jeff Davis 2025-02-20 22:31:22 -08:00
parent 41625ab8ea
commit b50a554cc8
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/backend/statistics/attribute_stats.c
View File

@ -480,23 +480,37 @@ attribute_statistics_update(FunctionCallInfo fcinfo, int elevel)
static Node *
get_attr_expr(Relation rel, int attnum)
{
if ((rel->rd_rel->relkind == RELKIND_INDEX
|| (rel->rd_rel->relkind == RELKIND_PARTITIONED_INDEX))
&& (rel->rd_indexprs != NIL)
&& (rel->rd_index->indkey.values[attnum - 1] == 0))
{
ListCell *indexpr_item = list_head(rel->rd_indexprs);
List *index_exprs;
ListCell *indexpr_item;
for (int i = 0; i < attnum - 1; i++)
if (rel->rd_index->indkey.values[i] == 0)
indexpr_item = lnext(rel->rd_indexprs, indexpr_item);
/* relation is not an index */
if (rel->rd_rel->relkind != RELKIND_INDEX &&
rel->rd_rel->relkind != RELKIND_PARTITIONED_INDEX)
return NULL;
if (indexpr_item == NULL) /* shouldn't happen */
elog(ERROR, "too few entries in indexprs list");
index_exprs = RelationGetIndexExpressions(rel);
return (Node *) lfirst(indexpr_item);
}
return NULL;
/* index has no expressions to give */
if (index_exprs == NIL)
return NULL;
/*
* The index attnum points directly to a relation attnum, then it's no an
* expression attribute.
*/
if (rel->rd_index->indkey.values[attnum - 1] != 0)
return NULL;
indexpr_item = list_head(rel->rd_indexprs);
for (int i = 0; i < attnum - 1; i++)
if (rel->rd_index->indkey.values[i] == 0)
indexpr_item = lnext(rel->rd_indexprs, indexpr_item);
if (indexpr_item == NULL) /* shouldn't happen */
elog(ERROR, "too few entries in indexprs list");
return (Node *) lfirst(indexpr_item);
}
/*