=== Applying patches on top of PostgreSQL commit ID 9ea3b6f751abd7701f3f32d9df26d66410754c94 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Aug 6 19:45:23 UTC 2025 On branch cf/5274 nothing to commit, working tree clean === using 'git am' to apply patch ./v18-0001-Introduce-the-ability-to-set-index-visibility-us.patch === Applying: Introduce the ability to set index visibility using ALTER INDEX Using index info to reconstruct a base tree... M doc/src/sgml/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/ref/create_index.sgml M src/backend/catalog/index.c M src/backend/commands/indexcmds.c M src/backend/commands/tablecmds.c M src/backend/optimizer/util/plancat.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/relcache.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/describe.c M src/bin/psql/tab-complete.in.c M src/include/catalog/pg_index.h M src/include/nodes/parsenodes.h M src/include/optimizer/optimizer.h M src/include/utils/guc_hooks.h M src/test/regress/expected/create_index.out M src/test/regress/sql/create_index.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/create_index.sql Auto-merging src/test/regress/expected/create_index.out Auto-merging src/include/utils/guc_hooks.h CONFLICT (content): Merge conflict in src/include/utils/guc_hooks.h Auto-merging src/include/optimizer/optimizer.h Auto-merging src/include/nodes/parsenodes.h Auto-merging src/include/catalog/pg_index.h Auto-merging src/bin/psql/tab-complete.in.c Auto-merging src/bin/psql/describe.c Auto-merging src/bin/pg_dump/t/002_pg_dump.pl Auto-merging src/bin/pg_dump/pg_dump.h Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/cache/relcache.c Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/parser/parse_utilcmd.c Auto-merging src/backend/parser/gram.y Auto-merging src/backend/optimizer/util/plancat.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/indexcmds.c Auto-merging src/backend/catalog/index.c Auto-merging doc/src/sgml/ref/create_index.sgml Auto-merging doc/src/sgml/config.sgml Auto-merging doc/src/sgml/catalogs.sgml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Introduce the ability to set index visibility using ALTER INDEX 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/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/indices.sgml M doc/src/sgml/ref/alter_index.sgml M doc/src/sgml/ref/create_index.sgml M src/backend/bootstrap/bootparse.y M src/backend/catalog/index.c M src/backend/catalog/toasting.c M src/backend/commands/indexcmds.c M src/backend/commands/tablecmds.c M src/backend/optimizer/util/plancat.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/relcache.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/describe.c M src/bin/psql/tab-complete.in.c M src/include/catalog/index.h M src/include/catalog/pg_index.h M src/include/nodes/parsenodes.h M src/include/optimizer/optimizer.h M src/include/parser/kwlist.h M src/include/utils/guc_hooks.h M src/include/utils/lsyscache.h M src/test/modules/test_ddl_deparse/Makefile M src/test/modules/test_ddl_deparse/meson.build M src/test/modules/test_ddl_deparse/test_ddl_deparse.c M src/test/regress/expected/create_index.out M src/test/regress/sql/create_index.sql Removing src/interfaces/ecpg/test/regression.diffs Removing src/interfaces/ecpg/test/regression.out Removing src/test/modules/test_ddl_deparse/expected/alter_index.out Removing src/test/modules/test_ddl_deparse/sql/alter_index.sql === using patch(1) to apply patch ./v18-0001-Introduce-the-ability-to-set-index-visibility-us.patch === patching file doc/src/sgml/catalogs.sgml Hunk #1 succeeded at 4612 (offset -6 lines). patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 5837 (offset 23 lines). patching file doc/src/sgml/indices.sgml patching file doc/src/sgml/ref/alter_index.sgml patching file doc/src/sgml/ref/create_index.sgml patching file src/backend/bootstrap/bootparse.y patching file src/backend/catalog/index.c patching file src/backend/catalog/toasting.c patching file src/backend/commands/indexcmds.c patching file src/backend/commands/tablecmds.c Hunk #2 succeeded at 4833 (offset -1 lines). Hunk #3 succeeded at 5273 (offset -1 lines). Hunk #4 succeeded at 5676 (offset -1 lines). Hunk #5 succeeded at 6632 (offset -1 lines). Hunk #6 succeeded at 15686 (offset 39 lines). Hunk #7 succeeded at 15718 (offset 39 lines). Hunk #8 succeeded at 22081 (offset 43 lines). patching file src/backend/optimizer/util/plancat.c Hunk #3 succeeded at 245 (offset -14 lines). Hunk #4 succeeded at 2700 (offset 85 lines). patching file src/backend/parser/gram.y Hunk #1 succeeded at 328 (offset 4 lines). Hunk #3 succeeded at 733 (offset -1 lines). Hunk #4 succeeded at 784 (offset -1 lines). Hunk #5 succeeded at 2193 (offset 35 lines). Hunk #6 succeeded at 2436 (offset 35 lines). Hunk #7 succeeded at 8316 (offset 92 lines). Hunk #8 succeeded at 8331 (offset 92 lines). Hunk #9 succeeded at 8349 (offset 92 lines). Hunk #10 succeeded at 8364 (offset 92 lines). Hunk #11 succeeded at 8387 (offset 92 lines). Hunk #12 succeeded at 17905 (offset 27 lines). Hunk #13 succeeded at 18092 (offset 27 lines). Hunk #14 succeeded at 18502 (offset 27 lines). Hunk #15 succeeded at 18751 (offset 27 lines). patching file src/backend/parser/parse_utilcmd.c Hunk #1 succeeded at 1767 (offset 22 lines). Hunk #2 succeeded at 2389 (offset 22 lines). patching file src/backend/utils/adt/ruleutils.c patching file src/backend/utils/cache/relcache.c patching file src/backend/utils/misc/guc_tables.c patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 428 (offset -4 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 7757 (offset 110 lines). Hunk #2 succeeded at 7801 (offset 110 lines). Hunk #3 succeeded at 7823 (offset 110 lines). Hunk #4 succeeded at 7944 (offset 110 lines). Hunk #5 succeeded at 8035 (offset 110 lines). Hunk #6 succeeded at 18533 (offset 293 lines). patching file src/bin/pg_dump/pg_dump.h Hunk #1 succeeded at 436 (offset 9 lines). patching file src/bin/pg_dump/t/002_pg_dump.pl Hunk #1 succeeded at 2323 (offset 138 lines). patching file src/bin/psql/describe.c Hunk #1 succeeded at 2330 (offset 1 line). Hunk #2 succeeded at 2360 (offset 1 line). Hunk #3 succeeded at 2400 (offset 1 line). patching file src/bin/psql/tab-complete.in.c Hunk #1 succeeded at 2444 (offset 25 lines). Hunk #2 succeeded at 3492 (offset 58 lines). patching file src/include/catalog/index.h patching file src/include/catalog/pg_index.h patching file src/include/nodes/parsenodes.h Hunk #1 succeeded at 2477 (offset 5 lines). Hunk #2 succeeded at 3509 (offset 37 lines). patching file src/include/optimizer/optimizer.h Hunk #1 succeeded at 214 (offset 2 lines). patching file src/include/parser/kwlist.h patching file src/include/utils/guc_hooks.h Hunk #1 FAILED at 178. 1 out of 1 hunk FAILED -- saving rejects to file src/include/utils/guc_hooks.h.rej patching file src/include/utils/lsyscache.h patching file src/interfaces/ecpg/test/regression.diffs patching file src/interfaces/ecpg/test/regression.out patching file src/test/modules/test_ddl_deparse/Makefile patching file src/test/modules/test_ddl_deparse/expected/alter_index.out patching file src/test/modules/test_ddl_deparse/meson.build patching file src/test/modules/test_ddl_deparse/sql/alter_index.sql patching file src/test/modules/test_ddl_deparse/test_ddl_deparse.c patching file src/test/regress/expected/create_index.out patching file src/test/regress/sql/create_index.sql Unstaged changes after reset: M doc/src/sgml/catalogs.sgml M doc/src/sgml/config.sgml M doc/src/sgml/indices.sgml M doc/src/sgml/ref/alter_index.sgml M doc/src/sgml/ref/create_index.sgml M src/backend/bootstrap/bootparse.y M src/backend/catalog/index.c M src/backend/catalog/toasting.c M src/backend/commands/indexcmds.c M src/backend/commands/tablecmds.c M src/backend/optimizer/util/plancat.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/relcache.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/describe.c M src/bin/psql/tab-complete.in.c M src/include/catalog/index.h M src/include/catalog/pg_index.h M src/include/nodes/parsenodes.h M src/include/optimizer/optimizer.h M src/include/parser/kwlist.h M src/include/utils/lsyscache.h M src/test/modules/test_ddl_deparse/Makefile M src/test/modules/test_ddl_deparse/meson.build M src/test/modules/test_ddl_deparse/test_ddl_deparse.c M src/test/regress/expected/create_index.out M src/test/regress/sql/create_index.sql Removing src/include/utils/guc_hooks.h.rej Removing src/interfaces/ecpg/test/regression.diffs Removing src/interfaces/ecpg/test/regression.out Removing src/test/modules/test_ddl_deparse/expected/alter_index.out Removing src/test/modules/test_ddl_deparse/sql/alter_index.sql === using 'git apply' to apply patch ./v18-0001-Introduce-the-ability-to-set-index-visibility-us.patch === Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'doc/src/sgml/indices.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/alter_index.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/create_index.sgml' cleanly. Applied patch to 'src/backend/bootstrap/bootparse.y' cleanly. Applied patch to 'src/backend/catalog/index.c' cleanly. Applied patch to 'src/backend/catalog/toasting.c' cleanly. Applied patch to 'src/backend/commands/indexcmds.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/optimizer/util/plancat.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/catalog/index.h' cleanly. Applied patch to 'src/include/catalog/pg_index.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/optimizer/optimizer.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. Applied patch to 'src/include/utils/guc_hooks.h' with conflicts. Applied patch to 'src/include/utils/lsyscache.h' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/modules/test_ddl_deparse/Makefile' cleanly. Falling back to direct application... Applied patch to 'src/test/modules/test_ddl_deparse/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/test/modules/test_ddl_deparse/test_ddl_deparse.c' cleanly. Applied patch to 'src/test/regress/expected/create_index.out' cleanly. Applied patch to 'src/test/regress/sql/create_index.sql' cleanly. U src/include/utils/guc_hooks.h diff --cc src/include/utils/guc_hooks.h index 82ac8646a8d,dd5128fd871..00000000000 --- a/src/include/utils/guc_hooks.h +++ b/src/include/utils/guc_hooks.h @@@ -174,5 -176,8 +174,11 @@@ extern void assign_wal_sync_method(int extern bool check_synchronized_standby_slots(char **newval, void **extra, GucSource source); extern void assign_synchronized_standby_slots(const char *newval, void *extra); ++<<<<<<< ours ++======= + extern bool check_idle_replication_slot_timeout(int *newval, void **extra, + GucSource source); + extern void assign_use_invisible_index(bool newval, void *extra); ++>>>>>>> theirs #endif /* GUC_HOOKS_H */