=== Applying patches on top of PostgreSQL commit ID 41c674d2e31e8304a6edbcb5183d326798ba00f6 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Oct 16 14:44:21 UTC 2025 On branch cf/5583 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-Fix-lookups-in-pg_-clear-restore-_-attribute-rela.patch === Applying: Fix lookups in pg_{clear,restore}_{attribute,relation}_stats(). Using index info to reconstruct a base tree... M src/backend/statistics/attribute_stats.c M src/backend/statistics/relation_stats.c M src/backend/statistics/stat_utils.c M src/include/statistics/stat_utils.h M src/test/regress/expected/stats_import.out Falling back to patching base and 3-way merge... Auto-merging src/backend/statistics/stat_utils.c CONFLICT (content): Merge conflict in src/backend/statistics/stat_utils.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 Fix lookups in pg_{clear,restore}_{attribute,relation}_stats(). 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/statistics/stat_utils.c === using patch(1) to apply patch ./v7-0001-Fix-lookups-in-pg_-clear-restore-_-attribute-rela.patch === patching file src/backend/statistics/attribute_stats.c Hunk #1 FAILED at 19. Hunk #2 FAILED at 143. Hunk #3 FAILED at 182. Hunk #4 FAILED at 191. Hunk #5 FAILED at 917. Hunk #6 FAILED at 926. 6 out of 6 hunks FAILED -- saving rejects to file src/backend/statistics/attribute_stats.c.rej patching file src/backend/statistics/relation_stats.c Hunk #1 FAILED at 20. Hunk #2 FAILED at 82. Hunk #3 FAILED at 89. 3 out of 3 hunks FAILED -- saving rejects to file src/backend/statistics/relation_stats.c.rej patching file src/backend/statistics/stat_utils.c Hunk #1 FAILED at 16. Hunk #2 FAILED at 29. Hunk #3 FAILED at 119. Hunk #4 FAILED at 176. 4 out of 4 hunks FAILED -- saving rejects to file src/backend/statistics/stat_utils.c.rej patching file src/include/statistics/stat_utils.h Hunk #1 succeeded at 18 with fuzz 2 (offset 3 lines). Hunk #2 FAILED at 33. 1 out of 2 hunks FAILED -- saving rejects to file src/include/statistics/stat_utils.h.rej patching file src/test/regress/expected/stats_import.out Hunk #1 FAILED at 120. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/expected/stats_import.out.rej Unstaged changes after reset: M src/include/statistics/stat_utils.h Removing src/backend/statistics/attribute_stats.c.rej Removing src/backend/statistics/relation_stats.c.rej Removing src/backend/statistics/stat_utils.c.rej Removing src/include/statistics/stat_utils.h.rej Removing src/test/regress/expected/stats_import.out.rej === using 'git apply' to apply patch ./v7-0001-Fix-lookups-in-pg_-clear-restore-_-attribute-rela.patch === 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' with conflicts. Applied patch to 'src/include/statistics/stat_utils.h' cleanly. Applied patch to 'src/test/regress/expected/stats_import.out' cleanly. U src/backend/statistics/stat_utils.c diff --cc src/backend/statistics/stat_utils.c index 0c139bf43a7,5fd49e26132..00000000000 --- a/src/backend/statistics/stat_utils.c +++ b/src/backend/statistics/stat_utils.c @@@ -168,8 -168,8 +168,13 @@@ RangeVarCallbackForStats(const RangeVa * If a previous lookup found an index, but the current lookup did * not, the index was dropped and the OID was reused for something * else between lookups. In theory, we could simply drop our lock on ++<<<<<<< ours + * the index's parent table and proceed, but in the interest of + * avoiding complexity, we just error. ++======= + * the index's relation and proceed, but in the interest of avoiding + * complexity, we just error. ++>>>>>>> theirs */ if (table_oid == relId && OidIsValid(*locked_oid)) ereport(ERROR,