=== Applying patches on top of PostgreSQL commit ID 043745c3a01fece996e4818945138320d10261bf === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Mar 12 02:52:29 UTC 2025 On branch cf/4460 nothing to commit, working tree clean === using 'git am' to apply patch ./v28-0001-Row-pattern-recognition-patch-for-raw-parser.patch === Applying: Row pattern recognition patch for raw parser. === using 'git am' to apply patch ./v28-0002-Row-pattern-recognition-patch-parse-analysis.patch === Applying: Row pattern recognition patch (parse/analysis). === using 'git am' to apply patch ./v28-0003-Row-pattern-recognition-patch-rewriter.patch === Applying: Row pattern recognition patch (rewriter). Using index info to reconstruct a base tree... M src/backend/utils/adt/ruleutils.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/adt/ruleutils.c === using 'git am' to apply patch ./v28-0004-Row-pattern-recognition-patch-planner.patch === Applying: Row pattern recognition patch (planner). Using index info to reconstruct a base tree... M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/plan/setrefs.c M src/backend/optimizer/prep/prepjointree.c M src/include/nodes/plannodes.h Falling back to patching base and 3-way merge... Auto-merging src/include/nodes/plannodes.h Auto-merging src/backend/optimizer/prep/prepjointree.c Auto-merging src/backend/optimizer/plan/setrefs.c Auto-merging src/backend/optimizer/plan/planner.c Auto-merging src/backend/optimizer/plan/createplan.c CONFLICT (content): Merge conflict in src/backend/optimizer/plan/createplan.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Row pattern recognition patch (planner). When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Unstaged changes after reset: M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/plan/setrefs.c M src/backend/optimizer/prep/prepjointree.c M src/include/nodes/plannodes.h === using patch(1) to apply patch ./v28-0004-Row-pattern-recognition-patch-planner.patch === patch: unrecognized option `--no-backup-if-mismatch' usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] [-r rej-name] [-V t | nil | never | none] [-x number] [-z backup-ext] [--posix] [origfile [patchfile]] patch >>>>>> theirs static Group *make_group(List *tlist, List *qual, int numGroupCols, AttrNumber *grpColIdx, Oid *grpOperators, Oid *grpCollations, Plan *lefttree); @@@ -2689,7 -2693,20 +2699,12 @@@ create_windowagg_plan(PlannerInfo *root ordColIdx, ordOperators, ordCollations, - wc->frameOptions, - wc->startOffset, - wc->endOffset, - wc->startInRangeFunc, - wc->endInRangeFunc, - wc->inRangeColl, - wc->inRangeAsc, - wc->inRangeNullsFirst, best_path->runCondition, + wc->rpSkipTo, + wc->patternVariable, + wc->patternRegexp, + wc->defineClause, + wc->defineInitial, best_path->qual, best_path->topwindow, subplan); @@@ -6693,10 -6710,15 +6708,19 @@@ make_agg(List *tlist, List *qual } static WindowAgg * -make_windowagg(List *tlist, Index winref, +make_windowagg(List *tlist, WindowClause *wc, int partNumCols, AttrNumber *partColIdx, Oid *partOperators, Oid *partCollations, int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators, Oid *ordCollations, ++<<<<<<< ours + List *runCondition, List *qual, bool topWindow, Plan *lefttree) ++======= + int frameOptions, Node *startOffset, Node *endOffset, + Oid startInRangeFunc, Oid endInRangeFunc, + Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst, List *runCondition, + RPSkipTo rpSkipTo, List *patternVariable, List *patternRegexp, List *defineClause, + List *defineInitial, + List *qual, bool topWindow, Plan *lefttree) ++>>>>>>> theirs { WindowAgg *node = makeNode(WindowAgg); Plan *plan = &node->plan; @@@ -6717,12 -6738,17 +6741,17 @@@ node->runCondition = runCondition; /* a duplicate of the above for EXPLAIN */ node->runConditionOrig = runCondition; - node->startInRangeFunc = startInRangeFunc; - node->endInRangeFunc = endInRangeFunc; - node->inRangeColl = inRangeColl; - node->inRangeAsc = inRangeAsc; - node->inRangeNullsFirst = inRangeNullsFirst; + node->startInRangeFunc = wc->startInRangeFunc; + node->endInRangeFunc = wc->endInRangeFunc; + node->inRangeColl = wc->inRangeColl; + node->inRangeAsc = wc->inRangeAsc; + node->inRangeNullsFirst = wc->inRangeNullsFirst; node->topWindow = topWindow; + node->rpSkipTo = rpSkipTo; + node->patternVariable = patternVariable; + node->patternRegexp = patternRegexp; + node->defineClause = defineClause; + node->defineInitial = defineInitial; plan->targetlist = tlist; plan->lefttree = lefttree;