=== Applying patches on top of PostgreSQL commit ID 2ef57908067ab29c22ae13f7775fe2afc330e8f6 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Apr  4 21:44:20 UTC 2025
On branch cf/3405
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0006_add_pg_stat_session_view.patch ===
Applying: Adds pg_stat_session view to track statistics accumulated during lifetime of a session (client backend).
Using index info to reconstruct a base tree...
M	doc/src/sgml/monitoring.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/utils/activity/backend_status.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/utils/backend_status.h
M	src/test/regress/expected/rules.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/rules.out
Auto-merging src/include/utils/backend_status.h
CONFLICT (content): Merge conflict in src/include/utils/backend_status.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/adt/pgstatfuncs.c
Auto-merging src/backend/utils/activity/backend_status.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/backend_status.c
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 Adds pg_stat_session view to track statistics accumulated during lifetime of a session (client backend).
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/backend/utils/activity/backend_status.c
M	src/backend/utils/adt/pgstatfuncs.c
M	src/include/catalog/pg_proc.dat
M	src/include/utils/backend_status.h
M	src/test/regress/expected/rules.out
M	src/test/regress/expected/sysviews.out
M	src/test/regress/sql/sysviews.sql
=== using patch(1) to apply patch ./0006_add_pg_stat_session_view.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./0006_add_pg_stat_session_view.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' with conflicts.
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' with conflicts.
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/test/regress/expected/sysviews.out' cleanly.
Applied patch to 'src/test/regress/sql/sysviews.sql' cleanly.
U src/backend/utils/activity/backend_status.c
U src/include/utils/backend_status.h
diff --cc src/backend/utils/activity/backend_status.c
index e1576e64b6d,d0c66f6d934..00000000000
--- a/src/backend/utils/activity/backend_status.c
+++ b/src/backend/utils/activity/backend_status.c
@@@ -300,8 -315,17 +300,22 @@@ pgstat_bestart_initial(void
  	lbeentry.st_activity_start_timestamp = 0;
  	lbeentry.st_state_start_timestamp = 0;
  	lbeentry.st_xact_start_timestamp = 0;
++<<<<<<< ours
 +	lbeentry.st_databaseid = InvalidOid;
 +	lbeentry.st_userid = InvalidOid;
++=======
+ 	lbeentry.st_databaseid = MyDatabaseId;
+ 
+ 	MemSet(&lbeentry.st_session, 0, sizeof(lbeentry.st_session));
+ 
+ 	/* We have userid for client-backends, wal-sender and bgworker processes */
+ 	if (lbeentry.st_backendType == B_BACKEND
+ 		|| lbeentry.st_backendType == B_WAL_SENDER
+ 		|| lbeentry.st_backendType == B_BG_WORKER)
+ 		lbeentry.st_userid = GetSessionUserId();
+ 	else
+ 		lbeentry.st_userid = InvalidOid;
++>>>>>>> theirs
  
  	/*
  	 * We may not have a MyProcPort (eg, if this is the autovacuum process).
@@@ -600,8 -538,8 +617,9 @@@ pgstat_report_activity(BackendState sta
  			/* st_xact_start_timestamp and wait_event_info are also disabled */
  			beentry->st_xact_start_timestamp = 0;
  			beentry->st_query_id = UINT64CONST(0);
 +			beentry->st_plan_id = UINT64CONST(0);
  			proc->wait_event_info = 0;
+ 			MemSet(&beentry->st_session, 0, sizeof(beentry->st_session));
  			PGSTAT_END_WRITE_ACTIVITY(beentry);
  		}
  		return;
diff --cc src/include/utils/backend_status.h
index 430ccd7d78e,a04c3581d66..00000000000
--- a/src/include/utils/backend_status.h
+++ b/src/include/utils/backend_status.h
@@@ -172,8 -189,8 +190,13 @@@ typedef struct PgBackendStatu
  	/* query identifier, optionally computed using post_parse_analyze_hook */
  	uint64		st_query_id;
  
++<<<<<<< ours
 +	/* plan identifier, optionally computed using planner_hook */
 +	uint64		st_plan_id;
++=======
+ 	/* Counters accumulated since the start of the session */
+ 	PgBackendSessionStatus st_session;
++>>>>>>> theirs
  } PgBackendStatus;