=== Applying patches on top of PostgreSQL commit ID 4623d71443de40781135a7040079ab4538974a6f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 27 17:41:22 UTC 2025
On branch cf/5595
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Store-working-memory-limit-per-Plan-SubPlan-rather-t.patch ===
Applying: Store working memory limit per Plan/SubPlan, rather than in GUC
Using index info to reconstruct a base tree...
M	src/backend/executor/execGrouping.c
M	src/backend/executor/execMain.c
M	src/backend/executor/execParallel.c
M	src/backend/executor/nodeAgg.c
M	src/backend/executor/nodeBitmapIndexscan.c
M	src/backend/executor/nodeSetOp.c
M	src/backend/executor/nodeSubplan.c
M	src/backend/optimizer/path/costsize.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/optimizer/plan/planner.c
M	src/include/executor/executor.h
M	src/include/nodes/execnodes.h
M	src/include/nodes/pathnodes.h
M	src/include/nodes/plannodes.h
M	src/include/nodes/primnodes.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/nodes/primnodes.h
Auto-merging src/include/nodes/plannodes.h
Auto-merging src/include/nodes/pathnodes.h
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/include/executor/executor.h
Auto-merging src/backend/optimizer/plan/planner.c
Auto-merging src/backend/optimizer/plan/createplan.c
Auto-merging src/backend/optimizer/path/costsize.c
Auto-merging src/backend/executor/nodeSubplan.c
Auto-merging src/backend/executor/nodeSetOp.c
Auto-merging src/backend/executor/nodeBitmapIndexscan.c
Auto-merging src/backend/executor/nodeAgg.c
Auto-merging src/backend/executor/execParallel.c
Auto-merging src/backend/executor/execMain.c
Auto-merging src/backend/executor/execGrouping.c
CONFLICT (content): Merge conflict in src/backend/executor/execGrouping.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 Store working memory limit per Plan/SubPlan, rather than in GUC
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/executor/Makefile
M	src/backend/executor/execGrouping.c
M	src/backend/executor/execMain.c
M	src/backend/executor/execParallel.c
M	src/backend/executor/execSRF.c
M	src/backend/executor/meson.build
M	src/backend/executor/nodeAgg.c
M	src/backend/executor/nodeBitmapIndexscan.c
M	src/backend/executor/nodeBitmapOr.c
M	src/backend/executor/nodeCtescan.c
M	src/backend/executor/nodeFunctionscan.c
M	src/backend/executor/nodeHash.c
M	src/backend/executor/nodeIncrementalSort.c
M	src/backend/executor/nodeMaterial.c
M	src/backend/executor/nodeMemoize.c
M	src/backend/executor/nodeRecursiveunion.c
M	src/backend/executor/nodeSetOp.c
M	src/backend/executor/nodeSort.c
M	src/backend/executor/nodeSubplan.c
M	src/backend/executor/nodeTableFuncscan.c
M	src/backend/executor/nodeWindowAgg.c
M	src/backend/optimizer/path/costsize.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/plan/subselect.c
M	src/include/executor/executor.h
M	src/include/executor/hashjoin.h
M	src/include/executor/nodeAgg.h
M	src/include/executor/nodeHash.h
M	src/include/nodes/execnodes.h
M	src/include/nodes/pathnodes.h
M	src/include/nodes/plannodes.h
M	src/include/nodes/primnodes.h
M	src/include/optimizer/planmain.h
Removing src/backend/executor/execWorkmem.c
=== using patch(1) to apply patch ./0001-Store-working-memory-limit-per-Plan-SubPlan-rather-t.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 <patchfile
=== using 'git apply' to apply patch ./0001-Store-working-memory-limit-per-Plan-SubPlan-rather-t.patch ===
Applied patch to 'src/backend/executor/Makefile' cleanly.
Applied patch to 'src/backend/executor/execGrouping.c' with conflicts.
Applied patch to 'src/backend/executor/execMain.c' cleanly.
Applied patch to 'src/backend/executor/execParallel.c' cleanly.
Applied patch to 'src/backend/executor/execSRF.c' cleanly.
Falling back to direct application...
Applied patch to 'src/backend/executor/meson.build' cleanly.
Applied patch to 'src/backend/executor/nodeAgg.c' cleanly.
Applied patch to 'src/backend/executor/nodeBitmapIndexscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeBitmapOr.c' cleanly.
Applied patch to 'src/backend/executor/nodeCtescan.c' cleanly.
Applied patch to 'src/backend/executor/nodeFunctionscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeHash.c' cleanly.
Applied patch to 'src/backend/executor/nodeIncrementalSort.c' cleanly.
Applied patch to 'src/backend/executor/nodeMaterial.c' cleanly.
Applied patch to 'src/backend/executor/nodeMemoize.c' cleanly.
Applied patch to 'src/backend/executor/nodeRecursiveunion.c' cleanly.
Applied patch to 'src/backend/executor/nodeSetOp.c' cleanly.
Applied patch to 'src/backend/executor/nodeSort.c' cleanly.
Applied patch to 'src/backend/executor/nodeSubplan.c' cleanly.
Applied patch to 'src/backend/executor/nodeTableFuncscan.c' cleanly.
Applied patch to 'src/backend/executor/nodeWindowAgg.c' cleanly.
Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/createplan.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly.
Applied patch to 'src/backend/optimizer/plan/subselect.c' cleanly.
Applied patch to 'src/include/executor/executor.h' cleanly.
Applied patch to 'src/include/executor/hashjoin.h' cleanly.
Applied patch to 'src/include/executor/nodeAgg.h' cleanly.
Applied patch to 'src/include/executor/nodeHash.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/include/nodes/pathnodes.h' cleanly.
Applied patch to 'src/include/nodes/plannodes.h' cleanly.
Applied patch to 'src/include/nodes/primnodes.h' cleanly.
Applied patch to 'src/include/optimizer/planmain.h' cleanly.
U src/backend/executor/execGrouping.c
diff --cc src/backend/executor/execGrouping.c
index 255bd795361,bcd1822da80..00000000000
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@@ -174,18 -175,19 +175,26 @@@ BuildTupleHashTable(PlanState *parent
  					bool use_variable_hash_iv)
  {
  	TupleHashTable hashtable;
++<<<<<<< ours
 +	Size		entrysize;
 +	Size		hash_mem_limit;
++=======
+ 	Size		entrysize = sizeof(TupleHashEntryData) + additionalsize;
++>>>>>>> theirs
  	MemoryContext oldcontext;
  	bool		allow_jit;
  	uint32		hash_iv = 0;
  
  	Assert(nbuckets > 0);
 +	additionalsize = MAXALIGN(additionalsize);
 +	entrysize = sizeof(TupleHashEntryData) + additionalsize;
  
- 	/* Limit initial table size request to not more than hash_mem */
- 	hash_mem_limit = get_hash_memory_limit() / entrysize;
+ 	/*
+ 	 * Limit initial table size request to not more than hash_mem
+ 	 *
+ 	 * XXX - we should also limit the *maximum* table size to hash_mem.
+ 	 */
+ 	hash_mem_limit = hash_mem_limit / entrysize;
  	if (nbuckets > hash_mem_limit)
  		nbuckets = hash_mem_limit;