=== 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.
Tue Mar 11 21:33:24 UTC 2025
On branch cf/5114
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v3-0001-Use-extended-stats-for-precise-estimation-of-buck.patch ===
Applying: Use extended stats for precise estimation of bucket size in hash join
Using index info to reconstruct a base tree...
M	src/backend/optimizer/path/costsize.c
M	src/backend/utils/adt/selfuncs.c
M	src/include/utils/selfuncs.h
M	src/test/regress/expected/stats_ext.out
M	src/test/regress/sql/stats_ext.sql
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/selfuncs.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/selfuncs.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 Use extended stats for precise estimation of bucket size in hash join
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/utils/adt/selfuncs.c
=== using patch(1) to apply patch ./v3-0001-Use-extended-stats-for-precise-estimation-of-buck.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 ./v3-0001-Use-extended-stats-for-precise-estimation-of-buck.patch ===
Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly.
Applied patch to 'src/backend/utils/adt/selfuncs.c' with conflicts.
Applied patch to 'src/include/utils/selfuncs.h' cleanly.
Applied patch to 'src/test/regress/expected/stats_ext.out' cleanly.
Applied patch to 'src/test/regress/sql/stats_ext.sql' cleanly.
U src/backend/utils/adt/selfuncs.c
diff --cc src/backend/utils/adt/selfuncs.c
index 5b35debc8ff,fb75b1ec46d..00000000000
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@@ -3790,7 -3790,7 +3790,11 @@@ estimate_multivariate_bucketsize(Planne
  	if (list_length(hashclauses) <= 1)
  
  		/*
++<<<<<<< ours
 +		 * Nothing to do for a single clause.  Could we employ univariate
++=======
+ 		 * Nothing to do for a single clause. Could we employ univariate
++>>>>>>> theirs
  		 * extended stat here?
  		 */
  		return hashclauses;
@@@ -3898,7 -3898,7 +3902,11 @@@
  
  		Assert(group_rel != NULL);
  
++<<<<<<< ours
 +		/* Employ the extended statistics. */
++=======
+ 		/* Let's employ extended statistics. */
++>>>>>>> theirs
  		origin_varinfos = varinfos;
  		for (;;)
  		{
@@@ -3911,7 -3911,7 +3919,11 @@@
  				break;
  
  			/*
++<<<<<<< ours
 +			 * We've got an estimation.  Use ndistinct value in a consistent
++=======
+ 			 * We've got an estimation. Use ndistinct value in a consistent
++>>>>>>> theirs
  			 * way - according to the caller's logic (see
  			 * final_cost_hashjoin).
  			 */
@@@ -3922,7 -3922,9 +3934,13 @@@
  
  		Assert(list_length(origin_varinfos) == list_length(origin_rinfos));
  
++<<<<<<< ours
 +		/* Collect unmatched clauses as otherclauses. */
++=======
+ 		/*
+ 		 * Remove already estimated clauses from the origin_rinfos
+ 		 */
++>>>>>>> theirs
  		forboth(lc1, origin_varinfos, lc2, origin_rinfos)
  		{
  			GroupVarInfo *vinfo = lfirst(lc1);