Skip to content

Fix ORCA permission checking crash for ROLLUP + window function queries #1643

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

Draft
lss602726449 wants to merge 1 commit into
base: cbdb-postgres-merge
Choose a base branch
from
+17 −16
Draft

Fix ORCA permission checking crash for ROLLUP + window function queries #1643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/backend/commands/matview.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2340,6 +2340,7 @@ get_prestate_rte(RangeTblEntry *rte, MV_TriggerTable *table,
rte->relkind = 0;
rte->rellockmode = 0;
rte->tablesample = NULL;
rte->perminfoindex = 0; /* subquery RTE does not need permission check */
rte->inh = false; /* must not be set for a subquery */

return rte;
Expand Down Expand Up @@ -2403,6 +2404,7 @@ replace_rte_with_delta(RangeTblEntry *rte, MV_TriggerTable *table, bool is_new,
rte->relkind = 0;
rte->rellockmode = 0;
rte->tablesample = NULL;
rte->perminfoindex = 0; /* subquery RTE does not need permission check */
rte->inh = false; /* must not be set for a subquery */

return rte;
Expand Down
5 changes: 3 additions & 2 deletions src/backend/gpopt/gpdbwrappers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2818,11 +2818,12 @@ gpdb::TestexprIsHashable(Node *testexpr, List *param_ids)
}

RTEPermissionInfo *
gpdb::GetRTEPermissionInfo(List *rteperminfos,
const RangeTblEntry *rte)
gpdb::GetRTEPermissionInfo(List *rteperminfos, const RangeTblEntry *rte)
{
GP_WRAP_START;
{
// Cast away const: upstream getRTEPermissionInfo() only reads
// rte->perminfoindex and rte->relid but its signature lacks const.
return getRTEPermissionInfo(rteperminfos, (RangeTblEntry *) rte);
}
GP_WRAP_END;
Expand Down
8 changes: 4 additions & 4 deletions src/backend/gpopt/translate/CContextDXLToPlStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,16 +594,16 @@ CContextDXLToPlStmt::GetRTEIndexByAssignedQueryId(

//---------------------------------------------------------------------------
// @function:
// CContextDXLToPlStmt::AddPerfmInfo
// CContextDXLToPlStmt::AddPermInfo
//
// @doc:
// Add a Perfission Info list entry
// Add a Permission Info list entry
//
//---------------------------------------------------------------------------
void
CContextDXLToPlStmt::AddPerfmInfo(RTEPermissionInfo *pi)
CContextDXLToPlStmt::AddPermInfo(RTEPermissionInfo *pi)
{
// add rte to rtable entries list
// add permission info to list
m_perminfo_list = gpdb::LAppend(m_perminfo_list, pi);
}

Expand Down
2 changes: 1 addition & 1 deletion src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5336,7 +5336,7 @@ CTranslatorDXLToPlStmt::ProcessDXLTblDescr(
rte->eref = alias;
rte->alias = alias;

m_dxl_to_plstmt_context->AddPerfmInfo(pi);
m_dxl_to_plstmt_context->AddPermInfo(pi);

// set up rte <> perm info link.
rte->perminfoindex = gpdb::ListLength(
Expand Down
10 changes: 4 additions & 6 deletions src/backend/optimizer/plan/orca.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,6 @@ transformGroupedWindows(Node *node, void *context)

Query *subq;
RangeTblEntry *rte;
RTEPermissionInfo *perminfo;
RangeTblRef *ref;
Alias *alias;
bool hadSubLinks = qry->hasSubLinks;
Expand All @@ -545,6 +544,7 @@ transformGroupedWindows(Node *node, void *context)

/* Core of subquery input table expression: */
subq->rtable = qry->rtable; /* before windowing */
subq->rteperminfos = qry->rteperminfos; /* before windowing */
subq->jointree = qry->jointree; /* before windowing */
subq->targetList = NIL; /* fill in later */

Expand Down Expand Up @@ -578,11 +578,9 @@ transformGroupedWindows(Node *node, void *context)
rte->eref = NULL; /* fill in later */
rte->inFromCl = true;

perminfo = makeNode(RTEPermissionInfo);
perminfo->requiredPerms = ACL_SELECT;

/*
* Default? rte->inh = 0; rte->checkAsUser = 0;
* Subquery RTEs do not need RTEPermissionInfo. Permission checks
* are performed on the base tables within the subquery itself.
*/

/*
Expand All @@ -605,7 +603,7 @@ transformGroupedWindows(Node *node, void *context)

/* Core of outer query input table expression: */
qry->rtable = list_make1(rte);
qry->rteperminfos = list_make1(perminfo);
qry->rteperminfos = NIL;
qry->jointree = (FromExpr *) makeNode(FromExpr);
qry->jointree->fromlist = list_make1(ref);
qry->jointree->quals = NULL;
Expand Down
6 changes: 3 additions & 3 deletions src/include/gpopt/translate/CContextDXLToPlStmt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ class CContextDXLToPlStmt
// list of all rtable entries
List *m_rtable_entries_list;

// list of all rtable entries
// list of all RTEPermissionInfo entries
List *m_perminfo_list;

// list of all subplan entries
Expand Down Expand Up @@ -249,8 +249,8 @@ class CContextDXLToPlStmt
Index GetRTEIndexByAssignedQueryId(ULONG assigned_query_id_for_target_rel,
BOOL *is_rte_exists);

// add a perm info.
void AddPerfmInfo(RTEPermissionInfo *pi);
// add a permission info entry
void AddPermInfo(RTEPermissionInfo *pi);

// get perm info from m_perminfo_list by given index
RTEPermissionInfo *GetPermInfoByIndex(Index index);
Expand Down
Loading