database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-06 18:42:54 +03:00
Code Activity

Fix bug in translate_col_privs_multilevel

Browse Source 
Fix incorrect code which was trying to convert a Bitmapset of columns at
the attnums according to a parent table and transform them into the
equivalent Bitmapset with same attnums according to the given child table.
This code is new as of a61b1f748 and was failing to do the correct
translation when there was an intermediate parent table between 'rel' and
'top_parent_rel'.

Reported-by: Ranier Vilela
Author: Richard Guo, Amit Langote
Discussion: https://postgr.es/m/CAEudQArohfB_Gy%2BhcH2-bANUkxgjJiP%3DABq01_LgTNTbcNijag%40mail.gmail.com
This commit is contained in:
David Rowley
2022-12-24 00:58:34 +13:00
parent b5d0f8ec01
commit bbfdf7180d
3 changed files with 68 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/backend/optimizer/util/inherit.c
View File

@@ -52,7 +52,7 @@ static Bitmapset *translate_col_privs(const Bitmapset *parent_privs,
static Bitmapset *translate_col_privs_multilevel(PlannerInfo *root,
RelOptInfo *rel,
RelOptInfo *top_parent_rel,
Bitmapset *top_parent_cols);
Bitmapset *parent_cols);
static void expand_appendrel_subquery(PlannerInfo *root, RelOptInfo *rel,
RangeTblEntry *rte, Index rti);
@@ -923,28 +923,26 @@ apply_child_basequals(PlannerInfo *root, RelOptInfo *parentrel,
/*
* translate_col_privs_multilevel
* Recursively translates the column numbers contained in
* 'top_parent_cols' to the columns numbers of a descendent relation
* given by 'relid'
* Recursively translates the column numbers contained in 'parent_cols'
* to the columns numbers of a descendent relation given by 'rel'
*/
static Bitmapset *
translate_col_privs_multilevel(PlannerInfo *root, RelOptInfo *rel,
RelOptInfo *top_parent_rel,
Bitmapset *top_parent_cols)
Bitmapset *parent_cols)
{
Bitmapset *result;
AppendRelInfo *appinfo;
if (top_parent_cols == NULL)
if (parent_cols == NULL)
return NULL;
/* Recurse if immediate parent is not the top parent. */
if (rel->parent != top_parent_rel)
{
if (rel->parent)
result = translate_col_privs_multilevel(root, rel->parent,
top_parent_rel,
top_parent_cols);
parent_cols = translate_col_privs_multilevel(root, rel->parent,
top_parent_rel,
parent_cols);
else
elog(ERROR, "rel with relid %u is not a child rel", rel->relid);
}
@@ -953,7 +951,5 @@ translate_col_privs_multilevel(PlannerInfo *root, RelOptInfo *rel,
appinfo = root->append_rel_array[rel->relid];
Assert(appinfo != NULL);
result = translate_col_privs(top_parent_cols, appinfo->translated_vars);
return result;
return translate_col_privs(parent_cols, appinfo->translated_vars);
}