=== Applying patches on top of PostgreSQL commit ID 0123ce131fca454009439dfa3b2266d1d40737d7 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Mar 14 22:40:23 UTC 2026 On branch cf/6582 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Add-stats_reset-column-to-pg_statio_all_sequences.patch === Applying: Add stats_reset column to pg_statio_all_sequences Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/include/catalog/catversion.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 CONFLICT (content): Merge conflict in src/test/regress/expected/stats.out Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/catalog/catversion.h CONFLICT (content): Merge conflict in src/include/catalog/catversion.h Auto-merging src/backend/catalog/system_views.sql 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 stats_reset column to pg_statio_all_sequences 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/catalog/system_views.sql M src/include/catalog/catversion.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-stats_reset-column-to-pg_statio_all_sequences.patch === patching file doc/src/sgml/monitoring.sgml Hunk #1 succeeded at 4909 (offset 9 lines). Hunk #2 succeeded at 5415 (offset 9 lines). patching file src/backend/catalog/system_views.sql patching file src/include/catalog/catversion.h Hunk #1 FAILED at 57. 1 out of 1 hunk FAILED -- saving rejects to file src/include/catalog/catversion.h.rej patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2451 (offset 1 line). Hunk #2 succeeded at 2494 (offset 1 line). Hunk #3 succeeded at 2526 (offset 1 line). patching file src/test/regress/expected/stats.out Hunk #1 succeeded at 1167 (offset 15 lines). patching file src/test/regress/sql/stats.sql Hunk #1 succeeded at 536 with fuzz 2 (offset 5 lines). Unstaged changes after reset: M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/test/regress/expected/rules.out M src/test/regress/expected/stats.out M src/test/regress/sql/stats.sql Removing src/include/catalog/catversion.h.rej === using 'git apply' to apply patch ./v2-0001-Add-stats_reset-column-to-pg_statio_all_sequences.patch === Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/include/catalog/catversion.h' with conflicts. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/stats.out' with conflicts. Applied patch to 'src/test/regress/sql/stats.sql' cleanly. U src/include/catalog/catversion.h U src/test/regress/expected/stats.out diff --cc src/include/catalog/catversion.h index 3da6a75ff87,e7d6f70ecfa..00000000000 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@@ -57,6 -57,6 +57,10 @@@ */ /* yyyymmddN */ ++<<<<<<< ours +#define CATALOG_VERSION_NO 202603131 ++======= + #define CATALOG_VERSION_NO 202603121 ++>>>>>>> theirs #endif diff --cc src/test/regress/expected/stats.out index 981d7c90822,19599095100..00000000000 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@@ -1161,12 -1152,36 +1161,43 @@@ SELECT stats_reset > :'db_reset_ts'::ti t (1 row) ++<<<<<<< ours +SELECT stats_reset > :'dbc_reset_ts'::timestamptz FROM pg_stat_database_conflicts WHERE datname = (SELECT current_database()); ++======= + -- Test that reset works for pg_statio_all_sequences + -- Same as the previous test, reset it once first so we have a baseline stats_reset to compare to + -- The sequence should also accumulate some stats for reset to matter + CREATE SEQUENCE test_seq1; + SELECT nextval('test_seq1'); + nextval + --------- + 1 + (1 row) + + SELECT pg_stat_reset_single_table_counters('test_seq1'::regclass); + pg_stat_reset_single_table_counters + ------------------------------------- + + (1 row) + + SELECT stats_reset AS seq_reset_ts FROM pg_statio_all_sequences WHERE relname ='test_seq1' \gset + SELECT pg_stat_reset_single_table_counters('test_seq1'::regclass); + pg_stat_reset_single_table_counters + ------------------------------------- + + (1 row) + + SELECT stats_reset > :'seq_reset_ts'::timestamptz FROM pg_statio_all_sequences WHERE relname ='test_seq1'; ++>>>>>>> theirs ?column? ---------- t (1 row) ++<<<<<<< ours ++======= + DROP SEQUENCE test_seq1; ++>>>>>>> theirs ---- -- pg_stat_get_snapshot_timestamp behavior ----