=== Applying patches on top of PostgreSQL commit ID 144ad723a4484927266a316d1c9550d56745ff67 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf.
Fri Jul 4 22:05:21 UTC 2025
On branch cf/5694
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v7-0001-Add-pg_buffercache_mark_dirty-_all-functions-for-.patch ===
Applying: Add pg_buffercache_mark_dirty[_all]() functions for testing
Using index info to reconstruct a base tree...
M contrib/pg_buffercache/pg_buffercache_pages.c
M doc/src/sgml/pgbuffercache.sgml
M src/backend/storage/buffer/bufmgr.c
M src/include/storage/bufmgr.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/storage/bufmgr.h
Auto-merging src/backend/storage/buffer/bufmgr.c
Auto-merging doc/src/sgml/pgbuffercache.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/pgbuffercache.sgml
Auto-merging contrib/pg_buffercache/pg_buffercache_pages.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 Add pg_buffercache_mark_dirty[_all]() functions for testing
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 contrib/pg_buffercache/Makefile
M contrib/pg_buffercache/expected/pg_buffercache.out
M contrib/pg_buffercache/meson.build
M contrib/pg_buffercache/pg_buffercache.control
M contrib/pg_buffercache/pg_buffercache_pages.c
M contrib/pg_buffercache/sql/pg_buffercache.sql
M doc/src/sgml/pgbuffercache.sgml
M src/backend/storage/buffer/bufmgr.c
M src/include/storage/bufmgr.h
Removing contrib/pg_buffercache/pg_buffercache--1.6--1.7.sql
=== using patch(1) to apply patch ./v7-0001-Add-pg_buffercache_mark_dirty-_all-functions-for-.patch ===
patching file src/include/storage/bufmgr.h
Hunk #1 succeeded at 315 (offset 3 lines).
patching file src/backend/storage/buffer/bufmgr.c
Hunk #1 succeeded at 6765 (offset 66 lines).
patching file doc/src/sgml/pgbuffercache.sgml
Hunk #1 succeeded at 35 with fuzz 1.
Hunk #2 FAILED at 50.
1 out of 4 hunks FAILED -- saving rejects to file doc/src/sgml/pgbuffercache.sgml.rej
patching file contrib/pg_buffercache/Makefile
patching file contrib/pg_buffercache/expected/pg_buffercache.out
patching file contrib/pg_buffercache/meson.build
patching file contrib/pg_buffercache/pg_buffercache--1.6--1.7.sql
patching file contrib/pg_buffercache/pg_buffercache.control
patching file contrib/pg_buffercache/pg_buffercache_pages.c
Hunk #2 succeeded at 773 (offset -1 lines).
patching file contrib/pg_buffercache/sql/pg_buffercache.sql
Unstaged changes after reset:
M contrib/pg_buffercache/Makefile
M contrib/pg_buffercache/expected/pg_buffercache.out
M contrib/pg_buffercache/meson.build
M contrib/pg_buffercache/pg_buffercache.control
M contrib/pg_buffercache/pg_buffercache_pages.c
M contrib/pg_buffercache/sql/pg_buffercache.sql
M doc/src/sgml/pgbuffercache.sgml
M src/backend/storage/buffer/bufmgr.c
M src/include/storage/bufmgr.h
Removing contrib/pg_buffercache/pg_buffercache--1.6--1.7.sql
Removing doc/src/sgml/pgbuffercache.sgml.rej
=== using 'git apply' to apply patch ./v7-0001-Add-pg_buffercache_mark_dirty-_all-functions-for-.patch ===
Applied patch to 'src/include/storage/bufmgr.h' cleanly.
Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly.
Applied patch to 'doc/src/sgml/pgbuffercache.sgml' with conflicts.
Applied patch to 'contrib/pg_buffercache/Makefile' cleanly.
Applied patch to 'contrib/pg_buffercache/expected/pg_buffercache.out' cleanly.
Applied patch to 'contrib/pg_buffercache/meson.build' cleanly.
Falling back to direct application...
Applied patch to 'contrib/pg_buffercache/pg_buffercache.control' cleanly.
Applied patch to 'contrib/pg_buffercache/pg_buffercache_pages.c' cleanly.
Applied patch to 'contrib/pg_buffercache/sql/pg_buffercache.sql' cleanly.
U doc/src/sgml/pgbuffercache.sgml
diff --cc doc/src/sgml/pgbuffercache.sgml
index 546ace8369e,bfccabd9c5e..00000000000
--- a/doc/src/sgml/pgbuffercache.sgml
+++ b/doc/src/sgml/pgbuffercache.sgml
@@@ -35,16 -35,26 +35,31 @@@
pg_buffercache_evict_all
+
+ pg_buffercache_mark_dirty
+
+
+
+ pg_buffercache_mark_dirty_all
+
+
This module provides the pg_buffercache_pages()
- function (wrapped in the pg_buffercache view),
+ function (wrapped in the pg_buffercache view), the
pg_buffercache_numa_pages() function (wrapped in the
pg_buffercache_numa view), the
pg_buffercache_summary() function, the
pg_buffercache_usage_counts() function, the
pg_buffercache_evict() function, the
++<<<<<<< ours
+ pg_buffercache_evict_relation() function and the
+ pg_buffercache_evict_all() function.
++=======
+ pg_buffercache_evict_relation() function, the
+ pg_buffercache_evict_all() function, the
+ pg_buffercache_mark_dirty() function and the
+ pg_buffercache_mark_dirty_all() function.
++>>>>>>> theirs