=== Applying patches on top of PostgreSQL commit ID 9e28c0bd13dce71676866b2647bf6bb17f50e82e === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jun 16 21:25:28 UTC 2026 On branch cf/6219 nothing to commit, working tree clean === using 'git am' to apply patch ./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch === Applying: Add --max-table-segment-pages option to pg_dump for parallel table dumping. .git/rebase-apply/patch:26: trailing whitespace. If the number of data pages in the relation is more than npages .git/rebase-apply/patch:36: trailing whitespace. In the extreme case a single 8kB heap page can have ~200 toast pointers each .git/rebase-apply/patch:37: trailing whitespace. corresponding to 1GB of data. If this data is also non-compressible then a .git/rebase-apply/patch:94: trailing whitespace. * This is currently used for collecting reverse .git/rebase-apply/patch:95: trailing whitespace. * dependencies for chunked data dump warning: squelched 20 whitespace errors warning: 25 lines add whitespace errors. Using index info to reconstruct a base tree... M doc/src/sgml/ref/pg_dump.sgml M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_archiver.h M src/bin/pg_dump/pg_dump.c M src/fe_utils/option_utils.c M src/include/fe_utils/option_utils.h Falling back to patching base and 3-way merge... Auto-merging src/include/fe_utils/option_utils.h Auto-merging src/fe_utils/option_utils.c Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_archiver.h Auto-merging src/bin/pg_dump/pg_backup_archiver.c CONFLICT (content): Merge conflict in src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/bin/pg_dump/pg_backup.h Auto-merging doc/src/sgml/ref/pg_dump.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 Add --max-table-segment-pages option to pg_dump for parallel table dumping. 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 ./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch === patching file doc/src/sgml/ref/pg_dump.sgml patching file src/bin/pg_dump/pg_backup.h patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 FAILED at 44. Hunk #2 succeeded at 155 (offset 1 line). Hunk #3 succeeded at 1997 (offset 1 line). Hunk #4 succeeded at 2038 (offset 1 line). Hunk #5 succeeded at 2054 (offset 1 line). Hunk #6 succeeded at 2071 (offset 1 line). Hunk #7 succeeded at 2821 (offset 1 line). Hunk #8 succeeded at 3051 (offset 1 line). Hunk #9 FAILED at 3281. Hunk #10 succeeded at 5090 (offset 38 lines). Hunk #11 succeeded at 5111 (offset 38 lines). Hunk #12 succeeded at 5123 (offset 38 lines). Hunk #13 succeeded at 5209 (offset 38 lines). 2 out of 13 hunks FAILED -- saving rejects to file src/bin/pg_dump/pg_backup_archiver.c.rej patching file src/bin/pg_dump/pg_backup_archiver.h patching file src/bin/pg_dump/pg_dump.c Hunk #9 succeeded at 7437 (offset -1 lines). Hunk #10 succeeded at 7687 (offset -1 lines). patching file src/bin/pg_dump/pg_dump.h patching file src/bin/pg_dump/t/004_pg_dump_parallel.pl patching file src/fe_utils/option_utils.c patching file src/include/fe_utils/option_utils.h Hunk #1 succeeded at 22 with fuzz 1. Unstaged changes after reset: M doc/src/sgml/ref/pg_dump.sgml M src/bin/pg_dump/pg_backup.h M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_backup_archiver.h M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/bin/pg_dump/t/004_pg_dump_parallel.pl M src/fe_utils/option_utils.c M src/include/fe_utils/option_utils.h Removing src/bin/pg_dump/pg_backup_archiver.c.rej === using 'git apply' to apply patch ./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch === /work/patches/./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch:51: trailing whitespace. If the number of data pages in the relation is more than npages /work/patches/./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch:61: trailing whitespace. In the extreme case a single 8kB heap page can have ~200 toast pointers each /work/patches/./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch:62: trailing whitespace. corresponding to 1GB of data. If this data is also non-compressible then a /work/patches/./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch:119: trailing whitespace. * This is currently used for collecting reverse /work/patches/./v16-0001-Add-max-table-segment-pages-option-to-pg_dump-fo.patch:120: trailing whitespace. * dependencies for chunked data dump Applied patch to 'doc/src/sgml/ref/pg_dump.sgml' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' with conflicts. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.h' 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/004_pg_dump_parallel.pl' cleanly. Applied patch to 'src/fe_utils/option_utils.c' cleanly. Applied patch to 'src/include/fe_utils/option_utils.h' cleanly. U src/bin/pg_dump/pg_backup_archiver.c warning: squelched 20 whitespace errors warning: 25 lines add whitespace errors. diff --cc src/bin/pg_dump/pg_backup_archiver.c index 4ec43f29622,e32bd8149cb..00000000000 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@@ -44,7 -44,7 +44,11 @@@ #include "pg_backup_archiver.h" #include "pg_backup_db.h" #include "pg_backup_utils.h" ++<<<<<<< ours +#include "pgtar.h" ++======= + #include "storage/block.h" ++>>>>>>> theirs #define TEXT_DUMP_HEADER "--\n-- PostgreSQL database dump\n--\n\n" #define TEXT_DUMPALL_HEADER "--\n-- PostgreSQL database cluster dump\n--\n\n" @@@ -3245,52 -3281,14 +3284,63 @@@ _tocEntryRequired(TocEntry *te, teSecti if (ropt->selTypes) { ++<<<<<<< ours + if (strcmp(te->desc, "STATISTICS DATA") == 0) + { + bool dumpthis = false; + + /* + * Statistics data entries can be for tables or indexes. Check + * the parent dependency to determine which type this entry + * belongs to, then apply the appropriate name filter. + */ + for (int i = 0; i < te->nDeps; i++) + { + TocEntry *pte = getTocEntryByDumpId(AH, te->dependencies[i]); + + if (!pte) + continue; + + if (ropt->selTable && + (strcmp(pte->desc, "TABLE") == 0 || + strcmp(pte->desc, "VIEW") == 0 || + strcmp(pte->desc, "FOREIGN TABLE") == 0 || + strcmp(pte->desc, "MATERIALIZED VIEW") == 0)) + { + if (ropt->tableNames.head == NULL || + simple_string_list_member(&ropt->tableNames, pte->tag)) + dumpthis = true; + } + + if (ropt->selIndex && + strcmp(pte->desc, "INDEX") == 0) + { + if (ropt->indexNames.head == NULL || + simple_string_list_member(&ropt->indexNames, pte->tag)) + dumpthis = true; + } + } + if (!dumpthis) + return 0; + } + else if (strcmp(te->desc, "TABLE") == 0 || + strcmp(te->desc, "TABLE DATA") == 0 || + strcmp(te->desc, "VIEW") == 0 || + strcmp(te->desc, "FOREIGN TABLE") == 0 || + strcmp(te->desc, "MATERIALIZED VIEW") == 0 || + strcmp(te->desc, "MATERIALIZED VIEW DATA") == 0 || + strcmp(te->desc, "SEQUENCE") == 0 || + strcmp(te->desc, "SEQUENCE SET") == 0) ++======= + if (strcmp(te->desc, "TABLE") == 0 || + strncmp(te->desc, "TABLE DATA", 10) == 0 || + strcmp(te->desc, "VIEW") == 0 || + strcmp(te->desc, "FOREIGN TABLE") == 0 || + strcmp(te->desc, "MATERIALIZED VIEW") == 0 || + strcmp(te->desc, "MATERIALIZED VIEW DATA") == 0 || + strcmp(te->desc, "SEQUENCE") == 0 || + strcmp(te->desc, "SEQUENCE SET") == 0) ++>>>>>>> theirs { if (!ropt->selTable) return 0;