Skip to content

ORCA: create windows hash aggregation physical operator when vectorization enabled #1258

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
jiaqizho merged 1 commit into from
Aug 15, 2025
Merged

ORCA: create windows hash aggregation physical operator when vectorization enabled #1258

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
14 changes: 8 additions & 6 deletions contrib/pg_stat_statements/pg_stat_statements.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,8 @@ static void pgss_post_parse_analyze(ParseState *pstate, Query *query,
static PlannedStmt *pgss_planner(Query *parse,
const char *query_string,
int cursorOptions,
ParamListInfo boundParams);
ParamListInfo boundParams,
OptimizerOptions *optimizer_options);
static void pgss_ExecutorStart(QueryDesc *queryDesc, int eflags);
static void pgss_ExecutorRun(QueryDesc *queryDesc,
ScanDirection direction,
Expand Down Expand Up @@ -866,7 +867,8 @@ static PlannedStmt *
pgss_planner(Query *parse,
const char *query_string,
int cursorOptions,
ParamListInfo boundParams)
ParamListInfo boundParams,
OptimizerOptions *optimizer_options)
{
PlannedStmt *result;

Expand Down Expand Up @@ -908,10 +910,10 @@ pgss_planner(Query *parse,
{
if (prev_planner_hook)
result = prev_planner_hook(parse, query_string, cursorOptions,
boundParams);
boundParams, optimizer_options);
else
result = standard_planner(parse, query_string, cursorOptions,
boundParams);
boundParams, optimizer_options);
}
PG_FINALLY();
{
Expand Down Expand Up @@ -945,10 +947,10 @@ pgss_planner(Query *parse,
{
if (prev_planner_hook)
result = prev_planner_hook(parse, query_string, cursorOptions,
boundParams);
boundParams, optimizer_options);
else
result = standard_planner(parse, query_string, cursorOptions,
boundParams);
boundParams, optimizer_options);
}

return result;
Expand Down
12 changes: 6 additions & 6 deletions gpcontrib/pg_hint_plan/pg_hint_plan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ pg_hint_plan_add_paths_to_joinrel(PlannerInfo *root,
static void *external_plan_hint_hook(Query *parse);
#endif
static PlannedStmt *pg_hint_plan_planner(Query *parse, const char *query_string, int cursorOptions,
ParamListInfo boundParams);
ParamListInfo boundParams, OptimizerOptions *optimizer_options);
static RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root,
int levels_needed,
List *initial_rels);
Expand Down Expand Up @@ -3118,7 +3118,7 @@ pg_hint_plan_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
*/
static PlannedStmt *
pg_hint_plan_planner(Query *parse, const char *query_string,
int cursorOptions, ParamListInfo boundParams)
int cursorOptions, ParamListInfo boundParams, OptimizerOptions *optimizer_options)
{
int save_nestlevel;
PlannedStmt *result;
Expand Down Expand Up @@ -3236,9 +3236,9 @@ pg_hint_plan_planner(Query *parse, const char *query_string,
}

if (prev_planner)
result = (*prev_planner) (parse, query_string, cursorOptions, boundParams);
result = (*prev_planner) (parse, query_string, cursorOptions, boundParams, optimizer_options);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams);
result = standard_planner(parse, query_string, cursorOptions, boundParams, optimizer_options);

current_hint_str = prev_hint_str;
recurse_level--;
Expand Down Expand Up @@ -3298,9 +3298,9 @@ pg_hint_plan_planner(Query *parse, const char *query_string,
}
current_hint_state = NULL;
if (prev_planner)
result = (*prev_planner) (parse, query_string, cursorOptions, boundParams);
result = (*prev_planner) (parse, query_string, cursorOptions, boundParams, optimizer_options);
else
result = standard_planner(parse, query_string, cursorOptions, boundParams);
result = standard_planner(parse, query_string, cursorOptions, boundParams, optimizer_options);

/* The upper-level planner still needs the current hint state */
if (HintStateStack != NIL)
Expand Down
1 change: 1 addition & 0 deletions src/backend/cdb/cdbllize.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1506,6 +1506,7 @@ motion_sanity_walker(Node *node, sanity_result_t *result)
{
case T_Result:
case T_WindowAgg:
case T_WindowHashAgg:
case T_TableFunctionScan:
case T_ShareInputScan:
case T_Append:
Expand Down
19 changes: 19 additions & 0 deletions src/backend/cdb/cdbplan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,25 @@ plan_tree_mutator(Node *node,
return (Node *) newwindow;
}
break;
case T_WindowHashAgg:
{
WindowHashAgg *window = (WindowHashAgg *) node;
WindowHashAgg *newwindow;

FLATCOPY(newwindow, window, WindowHashAgg);
PLANMUTATE(newwindow, window);

COPYARRAY(newwindow, window, partNumCols, partColIdx);
COPYARRAY(newwindow, window, partNumCols, partOperators);

COPYARRAY(newwindow, window, ordNumCols, ordColIdx);
COPYARRAY(newwindow, window, ordNumCols, ordOperators);
MUTATE(newwindow->startOffset, window->startOffset, Node *);
MUTATE(newwindow->endOffset, window->endOffset, Node *);

return (Node *) newwindow;
}
break;

case T_Unique:
{
Expand Down
1 change: 1 addition & 0 deletions src/backend/cdb/cdbtargeteddispatch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ DirectDispatchUpdateContentIdsFromPlan(PlannerInfo *root, Plan *plan)
DisableTargetedDispatch(&dispatchInfo);
break;
case T_WindowAgg:
case T_WindowHashAgg:
case T_TableFunctionScan:
case T_RecursiveUnion:
/* no change to dispatchInfo */
Expand Down
9 changes: 5 additions & 4 deletions src/backend/gpopt/CGPOptimizer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ PlannedStmt *
CGPOptimizer::GPOPTOptimizedPlan(
Query *query,
bool *
had_unexpected_failure // output : set to true if optimizer unexpectedly failed to produce plan
had_unexpected_failure, // output : set to true if optimizer unexpectedly failed to produce plan
OptimizerOptions *opts
)
{
SOptContext gpopt_context;
Expand All @@ -55,7 +56,7 @@ CGPOptimizer::GPOPTOptimizedPlan(

GPOS_TRY
{
plStmt = COptTasks::GPOPTOptimizedPlan(query, &gpopt_context);
plStmt = COptTasks::GPOPTOptimizedPlan(query, &gpopt_context, opts);
// clean up context
gpopt_context.Free(gpopt_context.epinQuery, gpopt_context.epinPlStmt);
}
Expand Down Expand Up @@ -199,9 +200,9 @@ CGPOptimizer::TerminateGPOPT()
//---------------------------------------------------------------------------
extern "C" {
PlannedStmt *
GPOPTOptimizedPlan(Query *query, bool *had_unexpected_failure)
GPOPTOptimizedPlan(Query *query, bool *had_unexpected_failure, OptimizerOptions *opts)
{
return CGPOptimizer::GPOPTOptimizedPlan(query, had_unexpected_failure);
return CGPOptimizer::GPOPTOptimizedPlan(query, had_unexpected_failure, opts);
}
}

Expand Down
13 changes: 12 additions & 1 deletion src/backend/gpopt/config/CConfigParamMapping.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,12 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elements[] = {
false, // m_negate_param
GPOS_WSZ_LIT(
"Disable the dynamic seq/bitmap/index scan in partition table")},

{EopttraceEnableWindowHashAgg, &optimizer_force_window_hash_agg,
false, // m_negate_param
GPOS_WSZ_LIT(
"Enable create window hash agg")},

};

//---------------------------------------------------------------------------
Expand All @@ -339,7 +345,8 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elements[] = {
CBitSet *
CConfigParamMapping::PackConfigParamInBitset(
CMemoryPool *mp,
ULONG xform_id // number of available xforms
ULONG xform_id, // number of available xforms
BOOL create_vec_plan
)
{
CBitSet *traceflag_bitset = GPOS_NEW(mp) CBitSet(mp, EopttraceSentinel);
Expand Down Expand Up @@ -561,6 +568,10 @@ CConfigParamMapping::PackConfigParamInBitset(
GPOPT_DISABLE_XFORM_TF(CXform::ExfRightOuterJoin2HashJoin));
}

if (create_vec_plan) {
traceflag_bitset->ExchangeSet(EopttraceEnableWindowHashAgg);
}

return traceflag_bitset;
}

Expand Down
Loading
Loading