=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Sat Feb  1 03:51:30 UTC 2025
On branch cf/3405
nothing to commit, working tree clean
=== applying patch ./0005-Add-pg_stat_session.patch
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' 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/pg_proc.dat' cleanly.
Applied patch to 'src/include/utils/backend_status.h' cleanly.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/test/regress/expected/sysviews.out' with conflicts.
Applied patch to 'src/test/regress/sql/sysviews.sql' with conflicts.
U src/test/regress/expected/sysviews.out
U src/test/regress/sql/sysviews.sql
diff --cc src/test/regress/expected/sysviews.out
index 352abc0bd4,308780f119..0000000000
--- a/src/test/regress/expected/sysviews.out
+++ b/src/test/regress/expected/sysviews.out
@@@ -223,11 -223,42 +223,51 @@@ select count(distinct utc_offset) >= 2
   t
  (1 row)
  
++<<<<<<< ours
 +-- One specific case we can check without much fear of breakage
 +-- is the historical local-mean-time value used for America/Los_Angeles.
 +select * from pg_timezone_abbrevs where abbrev = 'LMT';
 + abbrev |          utc_offset           | is_dst 
 +--------+-------------------------------+--------
 + LMT    | @ 7 hours 52 mins 58 secs ago | f
++=======
+ select active_count as prev_active_count from pg_stat_session where pid = pg_backend_pid() \gset
+ select (select active_count from pg_stat_session where pid = pg_backend_pid()) - :prev_active_count = 1 as ok;
+  ok 
+ ----
+  t
+ (1 row)
+ 
+ select idle_count as prev_idle_count from pg_stat_session where pid = pg_backend_pid() \gset
+ select (select idle_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_count = 1 as ok;
+  ok 
+ ----
+  t
+ (1 row)
+ 
+ select idle_in_transaction_count as prev_idle_in_transaction_count from pg_stat_session where pid = pg_backend_pid() \gset
+ begin;
+ commit;
+ select (select idle_in_transaction_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_in_transaction_count = 1 as ok;
+  ok 
+ ----
+  t
+ (1 row)
+ 
+ select idle_in_transaction_aborted_count as prev_idle_in_transaction_aborted_count from pg_stat_session where pid = pg_backend_pid() \gset
+ begin;
+ do $$
+ begin
+ raise 'test error';
+ end;
+ $$ language plpgsql;
+ ERROR:  test error
+ CONTEXT:  PL/pgSQL function inline_code_block line 3 at RAISE
+ rollback;
+ select (select idle_in_transaction_aborted_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_in_transaction_aborted_count = 1 as ok;
+  ok 
+ ----
+  t
++>>>>>>> theirs
  (1 row)
  
diff --cc src/test/regress/sql/sysviews.sql
index 66179f026b,cfa69a8975..0000000000
--- a/src/test/regress/sql/sysviews.sql
+++ b/src/test/regress/sql/sysviews.sql
@@@ -98,6 -98,24 +98,30 @@@ set timezone_abbreviations = 'Australia
  select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
  set timezone_abbreviations = 'India';
  select count(distinct utc_offset) >= 24 as ok from pg_timezone_abbrevs;
++<<<<<<< ours
 +-- One specific case we can check without much fear of breakage
 +-- is the historical local-mean-time value used for America/Los_Angeles.
 +select * from pg_timezone_abbrevs where abbrev = 'LMT';
++=======
+ 
+ select active_count as prev_active_count from pg_stat_session where pid = pg_backend_pid() \gset
+ select (select active_count from pg_stat_session where pid = pg_backend_pid()) - :prev_active_count = 1 as ok;
+ 
+ select idle_count as prev_idle_count from pg_stat_session where pid = pg_backend_pid() \gset
+ select (select idle_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_count = 1 as ok;
+ 
+ select idle_in_transaction_count as prev_idle_in_transaction_count from pg_stat_session where pid = pg_backend_pid() \gset
+ begin;
+ commit;
+ select (select idle_in_transaction_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_in_transaction_count = 1 as ok;
+ 
+ select idle_in_transaction_aborted_count as prev_idle_in_transaction_aborted_count from pg_stat_session where pid = pg_backend_pid() \gset
+ begin;
+ do $$
+ begin
+ raise 'test error';
+ end;
+ $$ language plpgsql;
+ rollback;
 -select (select idle_in_transaction_aborted_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_in_transaction_aborted_count = 1 as ok;
++select (select idle_in_transaction_aborted_count from pg_stat_session where pid = pg_backend_pid()) - :prev_idle_in_transaction_aborted_count = 1 as ok;
++>>>>>>> theirs