=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Apr 15 07:38:26 UTC 2026 On branch cf/6464 nothing to commit, working tree clean === using 'git am' to apply patch ./v1a-0001-Convert-vacuum_index_cleanup-and-gist-s-bufferin.patch === Applying: Convert `vacuum_index_cleanup` and gist's `buffering` reloptions from enum to ternary type Using index info to reconstruct a base tree... M src/backend/access/common/reloptions.c M src/backend/commands/vacuum.c M src/include/access/gist_private.h M src/include/access/reloptions.h M src/include/utils/rel.h Falling back to patching base and 3-way merge... Auto-merging src/include/utils/rel.h Auto-merging src/include/access/reloptions.h CONFLICT (content): Merge conflict in src/include/access/reloptions.h Auto-merging src/include/access/gist_private.h Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/access/common/reloptions.c CONFLICT (content): Merge conflict in src/backend/access/common/reloptions.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 Convert `vacuum_index_cleanup` and gist's `buffering` reloptions from enum to ternary type 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". === using patch(1) to apply patch ./v1a-0001-Convert-vacuum_index_cleanup-and-gist-s-bufferin.patch === patching file src/backend/access/common/reloptions.c Hunk #1 succeeded at 174 (offset 1 line). Hunk #2 succeeded at 537 (offset 10 lines). Hunk #3 succeeded at 548 (offset 10 lines). Hunk #4 FAILED at 905. Hunk #5 FAILED at 921. Hunk #6 succeeded at 949 (offset 10 lines). Hunk #7 succeeded at 1696 (offset 10 lines). Hunk #8 succeeded at 2017 (offset 12 lines). 2 out of 8 hunks FAILED -- saving rejects to file src/backend/access/common/reloptions.c.rej patching file src/backend/access/gist/gistbuild.c patching file src/backend/commands/vacuum.c Hunk #1 succeeded at 2183 (offset 5 lines). patching file src/include/access/gist_private.h patching file src/include/access/reloptions.h Hunk #1 succeeded at 98 (offset -1 lines). Hunk #2 FAILED at 192. Hunk #3 succeeded at 212 (offset -1 lines). 1 out of 3 hunks FAILED -- saving rejects to file src/include/access/reloptions.h.rej patching file src/include/utils/rel.h Hunk #1 succeeded at 332 (offset 2 lines). Hunk #2 succeeded at 340 (offset 2 lines). patching file src/test/modules/dummy_index_am/README patching file src/test/modules/dummy_index_am/dummy_index_am.c patching file src/test/modules/dummy_index_am/expected/reloptions.out patching file src/test/modules/dummy_index_am/sql/reloptions.sql patching file src/test/regress/expected/gist.out patching file src/test/regress/expected/reloptions.out patching file src/test/regress/sql/reloptions.sql Unstaged changes after reset: M src/backend/access/common/reloptions.c M src/backend/access/gist/gistbuild.c M src/backend/commands/vacuum.c M src/include/access/gist_private.h M src/include/access/reloptions.h M src/include/utils/rel.h M src/test/modules/dummy_index_am/README M src/test/modules/dummy_index_am/dummy_index_am.c M src/test/modules/dummy_index_am/expected/reloptions.out M src/test/modules/dummy_index_am/sql/reloptions.sql M src/test/regress/expected/gist.out M src/test/regress/expected/reloptions.out M src/test/regress/sql/reloptions.sql Removing src/backend/access/common/reloptions.c.rej Removing src/include/access/reloptions.h.rej === using 'git apply' to apply patch ./v1a-0001-Convert-vacuum_index_cleanup-and-gist-s-bufferin.patch === Applied patch to 'src/backend/access/common/reloptions.c' with conflicts. Applied patch to 'src/backend/access/gist/gistbuild.c' cleanly. Applied patch to 'src/backend/commands/vacuum.c' cleanly. Applied patch to 'src/include/access/gist_private.h' cleanly. Applied patch to 'src/include/access/reloptions.h' with conflicts. Applied patch to 'src/include/utils/rel.h' cleanly. Applied patch to 'src/test/modules/dummy_index_am/README' cleanly. Applied patch to 'src/test/modules/dummy_index_am/dummy_index_am.c' cleanly. Applied patch to 'src/test/modules/dummy_index_am/expected/reloptions.out' cleanly. Applied patch to 'src/test/modules/dummy_index_am/sql/reloptions.sql' cleanly. Applied patch to 'src/test/regress/expected/gist.out' cleanly. Applied patch to 'src/test/regress/expected/reloptions.out' cleanly. Applied patch to 'src/test/regress/sql/reloptions.sql' cleanly. U src/backend/access/common/reloptions.c U src/include/access/reloptions.h diff --cc src/backend/access/common/reloptions.c index 3e832c3797e,2ca45c98662..00000000000 --- a/src/backend/access/common/reloptions.c +++ b/src/backend/access/common/reloptions.c @@@ -938,8 -904,8 +914,13 @@@ add_local_bool_reloption(local_relopts * Allocate and initialize a new ternary reloption */ static relopt_ternary * ++<<<<<<< ours +init_ternary_reloption(uint32 kinds, const char *name, const char *desc, + LOCKMODE lockmode) ++======= + init_ternary_reloption(bits32 kinds, const char *name, const char *desc, + pg_ternary default_val, const char* unset_alias, LOCKMODE lockmode) ++>>>>>>> theirs { relopt_ternary *newoption; @@@ -954,8 -922,8 +937,13 @@@ * Add a new ternary reloption */ void ++<<<<<<< ours +add_ternary_reloption(uint32 kinds, const char *name, const char *desc, + LOCKMODE lockmode) ++======= + add_ternary_reloption(bits32 kinds, const char *name, const char *desc, + pg_ternary default_val, const char* unset_alias, LOCKMODE lockmode) ++>>>>>>> theirs { relopt_ternary *newoption; diff --cc src/include/access/reloptions.h index e8cb7f7a627,40ce291c894..00000000000 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@@ -187,20 -189,21 +188,27 @@@ typedef struct local_relopt (char *)(optstruct) + (optstruct)->member) extern relopt_kind add_reloption_kind(void); -extern void add_bool_reloption(bits32 kinds, const char *name, const char *desc, +extern void add_bool_reloption(uint32 kinds, const char *name, const char *desc, bool default_val, LOCKMODE lockmode); ++<<<<<<< ours +extern void add_ternary_reloption(uint32 kinds, const char *name, + const char *desc, LOCKMODE lockmode); +extern void add_int_reloption(uint32 kinds, const char *name, const char *desc, ++======= + extern void add_ternary_reloption(bits32 kinds, const char *name, + const char *desc, pg_ternary default_val, + const char* unset_alias, LOCKMODE lockmode); + extern void add_int_reloption(bits32 kinds, const char *name, const char *desc, ++>>>>>>> theirs int default_val, int min_val, int max_val, LOCKMODE lockmode); -extern void add_real_reloption(bits32 kinds, const char *name, const char *desc, +extern void add_real_reloption(uint32 kinds, const char *name, const char *desc, double default_val, double min_val, double max_val, LOCKMODE lockmode); -extern void add_enum_reloption(bits32 kinds, const char *name, const char *desc, +extern void add_enum_reloption(uint32 kinds, const char *name, const char *desc, relopt_enum_elt_def *members, int default_val, const char *detailmsg, LOCKMODE lockmode); -extern void add_string_reloption(bits32 kinds, const char *name, const char *desc, +extern void add_string_reloption(uint32 kinds, const char *name, const char *desc, const char *default_val, validate_string_relopt validator, LOCKMODE lockmode);