=== Applying patches on top of PostgreSQL commit ID bcb15f48786df1c4c3c0428645b5b0c6da0f3cb7 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 13 05:00:27 UTC 2026 On branch cf/6958 nothing to commit, working tree clean === using 'git am' to apply patch ./v01-0001-Allow-progress-tracking-of-sub-commands.patch === Applying: Allow progress tracking of sub-commands. Using index info to reconstruct a base tree... M src/backend/bootstrap/bootstrap.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/commands/indexcmds.c M src/backend/commands/repack.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/index.h Falling back to patching base and 3-way merge... Auto-merging src/include/catalog/index.h CONFLICT (content): Merge conflict in src/include/catalog/index.h Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/commands/repack.c Auto-merging src/backend/commands/indexcmds.c Auto-merging src/backend/catalog/index.c CONFLICT (content): Merge conflict in src/backend/catalog/index.c Auto-merging src/backend/catalog/heap.c Auto-merging src/backend/bootstrap/bootstrap.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 Allow progress tracking of sub-commands. 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 ./v01-0001-Allow-progress-tracking-of-sub-commands.patch === patching file contrib/file_fdw/file_fdw.c patching file src/backend/access/brin/brin.c patching file src/backend/access/transam/xact.c patching file src/backend/bootstrap/bootstrap.c patching file src/backend/catalog/heap.c Hunk #1 succeeded at 3606 (offset 18 lines). patching file src/backend/catalog/index.c Hunk #1 FAILED at 715. Hunk #2 succeeded at 769 (offset 6 lines). Hunk #3 succeeded at 1286 (offset 7 lines). Hunk #4 succeeded at 1553 (offset 15 lines). Hunk #5 succeeded at 2234 (offset 15 lines). Hunk #6 succeeded at 2306 (offset 15 lines). Hunk #7 succeeded at 2335 (offset 15 lines). Hunk #8 succeeded at 3039 (offset 27 lines). Hunk #9 succeeded at 3049 (offset 27 lines). Hunk #10 succeeded at 3100 (offset 27 lines). Hunk #11 succeeded at 3664 with fuzz 2 (offset 27 lines). Hunk #12 succeeded at 3698 (offset 27 lines). Hunk #13 succeeded at 3736 (offset 27 lines). Hunk #14 succeeded at 3854 (offset 27 lines). Hunk #15 succeeded at 3948 (offset 27 lines). Hunk #16 succeeded at 4120 (offset 27 lines). 1 out of 16 hunks FAILED -- saving rejects to file src/backend/catalog/index.c.rej patching file src/backend/catalog/toasting.c patching file src/backend/commands/indexcmds.c Hunk #1 succeeded at 604 (offset 10 lines). Hunk #2 succeeded at 633 (offset 10 lines). Hunk #3 succeeded at 1309 (offset 26 lines). Hunk #4 succeeded at 1616 (offset 26 lines). Hunk #5 succeeded at 1640 (offset 26 lines). Hunk #6 succeeded at 1861 (offset 26 lines). Hunk #7 succeeded at 3144 (offset 154 lines). Hunk #8 succeeded at 3266 (offset 154 lines). Hunk #9 succeeded at 3690 (offset 154 lines). Hunk #10 succeeded at 3700 (offset 154 lines). Hunk #11 succeeded at 4120 (offset 154 lines). Hunk #12 succeeded at 4143 (offset 154 lines). Hunk #13 succeeded at 4266 (offset 154 lines). Hunk #14 succeeded at 4307 (offset 154 lines). Hunk #15 succeeded at 4330 (offset 156 lines). Hunk #16 succeeded at 4405 (offset 156 lines). Hunk #17 succeeded at 4501 (offset 156 lines). Hunk #18 succeeded at 4547 (offset 156 lines). Hunk #19 succeeded at 4623 (offset 156 lines). patching file src/backend/commands/repack.c Hunk #1 succeeded at 1890 (offset -30 lines). Hunk #2 succeeded at 1959 (offset -30 lines). Hunk #3 succeeded at 3424 (offset 66 lines). patching file src/backend/utils/activity/backend_progress.c patching file src/backend/utils/activity/backend_status.c patching file src/backend/utils/adt/pgstatfuncs.c Hunk #1 succeeded at 376 (offset 62 lines). Hunk #2 succeeded at 385 (offset 62 lines). Hunk #3 succeeded at 399 (offset 62 lines). patching file src/include/catalog/index.h Hunk #2 FAILED at 70. Hunk #3 succeeded at 149 (offset 1 line). 1 out of 3 hunks FAILED -- saving rejects to file src/include/catalog/index.h.rej patching file src/include/utils/backend_status.h Unstaged changes after reset: M contrib/file_fdw/file_fdw.c M src/backend/access/brin/brin.c M src/backend/access/transam/xact.c M src/backend/bootstrap/bootstrap.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/catalog/toasting.c M src/backend/commands/indexcmds.c M src/backend/commands/repack.c M src/backend/utils/activity/backend_progress.c M src/backend/utils/activity/backend_status.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/index.h M src/include/utils/backend_status.h Removing src/backend/catalog/index.c.rej Removing src/include/catalog/index.h.rej === using 'git apply' to apply patch ./v01-0001-Allow-progress-tracking-of-sub-commands.patch === Applied patch to 'contrib/file_fdw/file_fdw.c' cleanly. Applied patch to 'src/backend/access/brin/brin.c' cleanly. Applied patch to 'src/backend/access/transam/xact.c' cleanly. Applied patch to 'src/backend/bootstrap/bootstrap.c' cleanly. Applied patch to 'src/backend/catalog/heap.c' cleanly. Applied patch to 'src/backend/catalog/index.c' with conflicts. Applied patch to 'src/backend/catalog/toasting.c' cleanly. Applied patch to 'src/backend/commands/indexcmds.c' cleanly. Applied patch to 'src/backend/commands/repack.c' cleanly. Applied patch to 'src/backend/utils/activity/backend_progress.c' cleanly. Applied patch to 'src/backend/utils/activity/backend_status.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/catalog/index.h' with conflicts. Applied patch to 'src/include/utils/backend_status.h' cleanly. U src/backend/catalog/index.c U src/include/catalog/index.h diff --cc src/backend/catalog/index.c index 4c5da7e5db0,e5d12308b6e..00000000000 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@@ -715,11 -715,6 +715,14 @@@ UpdateIndexRelation(Oid indexoid * already exists. * INDEX_CREATE_PARTITIONED: * create a partitioned index (table must be partitioned) ++<<<<<<< ours + * INDEX_CREATE_SUPPRESS_PROGRESS: + * don't report progress during the index build. + * INDEX_CREATE_DEFERRABLE: + * index supports a deferrable constraint, mark it as + * non-immediate (indimmediate = false). ++======= ++>>>>>>> theirs * * constr_flags: flags passed to index_constraint_create * (only if INDEX_CREATE_ADD_CONSTRAINT is set) @@@ -3664,9 -3633,8 +3665,8 @@@ reindex_index(const ReindexStmt *stmt, int save_sec_context; int save_nestlevel; IndexInfo *indexInfo; - volatile bool skipped_constraint = false; + bool skipped_constraint = false; PGRUsage ru0; - bool progress = ((params->options & REINDEXOPT_REPORT_PROGRESS) != 0); bool set_tablespace = false; pg_rusage_init(&ru0); diff --cc src/include/catalog/index.h index b952ad071d3,d4c77f3df3f..00000000000 --- a/src/include/catalog/index.h +++ b/src/include/catalog/index.h @@@ -71,8 -70,6 +70,11 @@@ extern void index_check_primary_key(Rel #define INDEX_CREATE_IF_NOT_EXISTS (1 << 4) #define INDEX_CREATE_PARTITIONED (1 << 5) #define INDEX_CREATE_INVALID (1 << 6) ++<<<<<<< ours +#define INDEX_CREATE_SUPPRESS_PROGRESS (1 << 7) +#define INDEX_CREATE_DEFERRABLE (1 << 8) ++======= ++>>>>>>> theirs extern Oid index_create(Relation heapRelation, const char *indexRelationName,