=== Applying patches on top of PostgreSQL commit ID 454c046094ab3431c2ce0c540c46e623bc05bd1a === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Sep 15 10:02:19 UTC 2025 On branch cf/5614 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Add-metadata-non-leaf-index-block-statistics-to-p.patch === Applying: Add metadata (non-leaf) index block statistics to pg_stat functions and system views. Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/access/brin/brin.c M src/backend/access/gin/ginget.c M src/backend/access/gist/gist.c M src/backend/access/gist/gistbuild.c M src/backend/access/nbtree/nbtinsert.c M src/backend/access/nbtree/nbtsearch.c M src/backend/access/nbtree/nbtutils.c M src/backend/access/spgist/spgutils.c M src/backend/catalog/system_views.sql M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/pgstat.h M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/stats.sql Auto-merging src/test/regress/expected/stats.out Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/pgstat.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/utils/activity/pgstat_relation.c Auto-merging src/backend/catalog/system_views.sql Auto-merging src/backend/access/spgist/spgutils.c Auto-merging src/backend/access/nbtree/nbtutils.c Auto-merging src/backend/access/nbtree/nbtsearch.c Auto-merging src/backend/access/nbtree/nbtinsert.c Auto-merging src/backend/access/gist/gistbuild.c Auto-merging src/backend/access/gist/gist.c CONFLICT (content): Merge conflict in src/backend/access/gist/gist.c Auto-merging src/backend/access/gin/ginget.c Auto-merging src/backend/access/brin/brin.c Auto-merging doc/src/sgml/monitoring.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 metadata (non-leaf) index block statistics to pg_stat functions and system views. 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/monitoring.sgml M src/backend/access/brin/brin.c M src/backend/access/brin/brin_revmap.c M src/backend/access/gin/ginbtree.c M src/backend/access/gin/ginfast.c M src/backend/access/gin/ginget.c M src/backend/access/gin/ginutil.c M src/backend/access/gist/gist.c M src/backend/access/gist/gistbuild.c M src/backend/access/gist/gistget.c M src/backend/access/hash/hashpage.c M src/backend/access/nbtree/nbtinsert.c M src/backend/access/nbtree/nbtpage.c M src/backend/access/nbtree/nbtsearch.c M src/backend/access/nbtree/nbtutils.c M src/backend/access/spgist/spgdoinsert.c M src/backend/access/spgist/spgscan.c M src/backend/access/spgist/spgutils.c M src/backend/catalog/system_views.sql M src/backend/utils/activity/pgstat_database.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/pgstat.h M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql === using patch(1) to apply patch ./v2-0001-Add-metadata-non-leaf-index-block-statistics-to-p.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 3431 (offset 11 lines). Hunk #2 succeeded at 4406 (offset 13 lines). Hunk #3 succeeded at 4550 (offset 13 lines). patching file src/backend/access/brin/brin.c patching file src/backend/access/brin/brin_revmap.c patching file src/backend/access/gin/ginbtree.c patching file src/backend/access/gin/ginfast.c patching file src/backend/access/gin/ginget.c Hunk #2 succeeded at 1494 (offset 2 lines). Hunk #3 succeeded at 1848 (offset 2 lines). Hunk #4 succeeded at 1874 (offset 2 lines). patching file src/backend/access/gin/ginutil.c patching file src/backend/access/gist/gist.c Hunk #4 succeeded at 1102 with fuzz 1. Hunk #5 FAILED at 1131. 1 out of 6 hunks FAILED -- saving rejects to file src/backend/access/gist/gist.c.rej patching file src/backend/access/gist/gistbuild.c Hunk #2 succeeded at 968 with fuzz 1. patching file src/backend/access/gist/gistget.c patching file src/backend/access/hash/hashpage.c patching file src/backend/access/nbtree/nbtinsert.c Hunk #1 succeeded at 22 (offset 1 line). Hunk #2 succeeded at 1262 (offset 1 line). Hunk #3 succeeded at 2259 (offset 1 line). Hunk #4 succeeded at 2270 (offset 1 line). Hunk #5 succeeded at 2339 (offset 1 line). Hunk #6 succeeded at 2480 (offset 1 line). patching file src/backend/access/nbtree/nbtpage.c patching file src/backend/access/nbtree/nbtsearch.c Hunk #4 succeeded at 2516 (offset -2 lines). Hunk #5 succeeded at 2544 (offset -2 lines). Hunk #6 succeeded at 2555 (offset -2 lines). Hunk #7 succeeded at 2574 (offset -2 lines). Hunk #8 succeeded at 2664 (offset -2 lines). Hunk #9 succeeded at 2688 (offset -2 lines). patching file src/backend/access/nbtree/nbtutils.c Hunk #1 succeeded at 22 with fuzz 1 (offset 1 line). patching file src/backend/access/spgist/spgdoinsert.c patching file src/backend/access/spgist/spgscan.c patching file src/backend/access/spgist/spgutils.c patching file src/backend/catalog/system_views.sql Hunk #1 succeeded at 774 (offset 8 lines). Hunk #2 succeeded at 788 (offset 8 lines). Hunk #3 succeeded at 847 (offset 8 lines). Hunk #4 succeeded at 1083 (offset 8 lines). patching file src/backend/utils/activity/pgstat_database.c patching file src/backend/utils/activity/pgstat_relation.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 5592 (offset 12 lines). Hunk #2 succeeded at 5808 (offset 12 lines). patching file src/include/pgstat.h patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 1872 (offset 4 lines). Hunk #2 succeeded at 2371 (offset 10 lines). Hunk #3 succeeded at 2393 (offset 10 lines). Hunk #4 succeeded at 2402 (offset 10 lines). Hunk #5 succeeded at 2417 (offset 10 lines). Hunk #6 succeeded at 2435 (offset 10 lines). Hunk #7 succeeded at 2448 (offset 10 lines). Hunk #8 succeeded at 2466 (offset 10 lines). patching file src/test/regress/expected/stats.out Hunk #1 succeeded at 1879 (offset 11 lines). patching file src/test/regress/sql/stats.sql Hunk #1 succeeded at 930 (offset 5 lines). Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/access/brin/brin.c M src/backend/access/brin/brin_revmap.c M src/backend/access/gin/ginbtree.c M src/backend/access/gin/ginfast.c M src/backend/access/gin/ginget.c M src/backend/access/gin/ginutil.c M src/backend/access/gist/gist.c M src/backend/access/gist/gistbuild.c M src/backend/access/gist/gistget.c M src/backend/access/hash/hashpage.c M src/backend/access/nbtree/nbtinsert.c M src/backend/access/nbtree/nbtpage.c M src/backend/access/nbtree/nbtsearch.c M src/backend/access/nbtree/nbtutils.c M src/backend/access/spgist/spgdoinsert.c M src/backend/access/spgist/spgscan.c M src/backend/access/spgist/spgutils.c M src/backend/catalog/system_views.sql M src/backend/utils/activity/pgstat_database.c M src/backend/utils/activity/pgstat_relation.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/pg_proc.dat M src/include/pgstat.h M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql Removing src/backend/access/gist/gist.c.rej === using 'git apply' to apply patch ./v2-0001-Add-metadata-non-leaf-index-block-statistics-to-p.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/access/brin/brin.c' cleanly. Applied patch to 'src/backend/access/brin/brin_revmap.c' cleanly. Applied patch to 'src/backend/access/gin/ginbtree.c' cleanly. Applied patch to 'src/backend/access/gin/ginfast.c' cleanly. Applied patch to 'src/backend/access/gin/ginget.c' cleanly. Applied patch to 'src/backend/access/gin/ginutil.c' cleanly. Applied patch to 'src/backend/access/gist/gist.c' with conflicts. Applied patch to 'src/backend/access/gist/gistbuild.c' cleanly. Applied patch to 'src/backend/access/gist/gistget.c' cleanly. Applied patch to 'src/backend/access/hash/hashpage.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtinsert.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtpage.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtsearch.c' cleanly. Applied patch to 'src/backend/access/nbtree/nbtutils.c' cleanly. Applied patch to 'src/backend/access/spgist/spgdoinsert.c' cleanly. Applied patch to 'src/backend/access/spgist/spgscan.c' cleanly. Applied patch to 'src/backend/access/spgist/spgutils.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_database.c' cleanly. Applied patch to 'src/backend/utils/activity/pgstat_relation.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/pgstat.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/stats.out' cleanly. Applied patch to 'src/test/regress/sql/stats.sql' cleanly. U src/backend/access/gist/gist.c diff --cc src/backend/access/gist/gist.c index a96796d5c7d,2e5cc912964..00000000000 --- a/src/backend/access/gist/gist.c +++ b/src/backend/access/gist/gist.c @@@ -1096,9 -1102,12 +1102,12 @@@ gistFindCorrectParent(Relation r, GISTI break; } parent->buffer = ReadBuffer(r, parent->blkno); + + pgstat_count_metadata_buffer(r); + LockBuffer(parent->buffer, GIST_EXCLUSIVE); gistcheckpage(r, parent->buffer); - parent->page = (Page) BufferGetPage(parent->buffer); + parent->page = BufferGetPage(parent->buffer); } /* @@@ -1121,7 -1130,8 +1130,12 @@@ while (ptr) { ptr->buffer = ReadBuffer(r, ptr->blkno); ++<<<<<<< ours + ptr->page = BufferGetPage(ptr->buffer); ++======= + ptr->page = (Page) BufferGetPage(ptr->buffer); + pgstat_count_metadata_buffer_if(!GistPageIsLeaf(ptr->page), r); ++>>>>>>> theirs ptr = ptr->parent; }