=== Applying patches on top of PostgreSQL commit ID ac4494646daee27df20f7cded3ad49be24e9a98c ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Mar 12 21:13:29 UTC 2025
On branch cf/4538
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-Split-relation-into-schemaname-and-relname.patch ===
Applying: Split relation into schemaname and relname.
Using index info to reconstruct a base tree...
M	src/bin/pg_dump/pg_dump.c
M	src/include/catalog/pg_proc.dat
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/bin/pg_dump/pg_dump.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_dump.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 Split relation into schemaname and relname.
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	doc/src/sgml/func.sgml
M	src/backend/statistics/attribute_stats.c
M	src/backend/statistics/relation_stats.c
M	src/backend/statistics/stat_utils.c
M	src/bin/pg_dump/pg_dump.c
M	src/bin/pg_dump/t/002_pg_dump.pl
M	src/include/catalog/pg_proc.dat
M	src/include/statistics/stat_utils.h
M	src/test/regress/expected/stats_import.out
M	src/test/regress/sql/stats_import.sql
=== using patch(1) to apply patch ./v7-0001-Split-relation-into-schemaname-and-relname.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 ./v7-0001-Split-relation-into-schemaname-and-relname.patch ===
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/statistics/stat_utils.h' cleanly.
Applied patch to 'src/backend/statistics/attribute_stats.c' cleanly.
Applied patch to 'src/backend/statistics/relation_stats.c' cleanly.
Applied patch to 'src/backend/statistics/stat_utils.c' cleanly.
Applied patch to 'src/bin/pg_dump/pg_dump.c' with conflicts.
Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly.
Applied patch to 'src/test/regress/expected/stats_import.out' cleanly.
Applied patch to 'src/test/regress/sql/stats_import.sql' cleanly.
Applied patch to 'doc/src/sgml/func.sgml' cleanly.
U src/bin/pg_dump/pg_dump.c
diff --cc src/bin/pg_dump/pg_dump.c
index c371570501a,6cf2c7d1fe4..00000000000
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@@ -10490,7 -10492,7 +10490,11 @@@ dumpRelationStats(Archive *fout, const 
  	PQExpBuffer out;
  	DumpId	   *deps = NULL;
  	int			ndeps = 0;
++<<<<<<< ours
 +	char	   *qualified_name;
++=======
+ 	char		reltuples_str[FLOAT_SHORTEST_DECIMAL_LEN];
++>>>>>>> theirs
  	int			i_attname;
  	int			i_inherited;
  	int			i_null_frac;
@@@ -10561,11 -10561,15 +10563,14 @@@
  	appendPQExpBufferStr(out, "SELECT * FROM pg_catalog.pg_restore_relation_stats(\n");
  	appendPQExpBuffer(out, "\t'version', '%u'::integer,\n",
  					  fout->remoteVersion);
- 	appendPQExpBufferStr(out, "\t'relation', ");
- 	appendStringLiteralAH(out, qualified_name, fout);
- 	appendPQExpBufferStr(out, "::regclass,\n");
+ 	appendPQExpBufferStr(out, "\t'schemaname', ");
+ 	appendStringLiteralAH(out, rsinfo->dobj.namespace->dobj.name, fout);
+ 	appendPQExpBufferStr(out, ",\n");
+ 	appendPQExpBufferStr(out, "\t'relname', ");
+ 	appendStringLiteralAH(out, rsinfo->dobj.name, fout);
+ 	appendPQExpBufferStr(out, ",\n");
  	appendPQExpBuffer(out, "\t'relpages', '%d'::integer,\n", rsinfo->relpages);
 -	float_to_shortest_decimal_buf(rsinfo->reltuples, reltuples_str);
 -	appendPQExpBuffer(out, "\t'reltuples', '%s'::real,\n", reltuples_str);
 +	appendPQExpBuffer(out, "\t'reltuples', '%s'::real,\n", rsinfo->reltuples);
  	appendPQExpBuffer(out, "\t'relallvisible', '%d'::integer\n);\n",
  					  rsinfo->relallvisible);