=== Applying patches on top of PostgreSQL commit ID 8daeaa9b642c3c23cbc516da80d50aade6f4dc07 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Jul  8 06:35:27 UTC 2026
On branch cf/6992
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v2-logical-rollback-spike.patch ===
Applying: Do not count logical decoding cleanup aborts in xact_rollback
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xact.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/replication/logical/snapbuild.c
M	src/backend/utils/activity/pgstat_xact.c
M	src/include/pgstat.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/pgstat.h
Auto-merging src/backend/utils/activity/pgstat_xact.c
Auto-merging src/backend/replication/logical/snapbuild.c
Auto-merging src/backend/replication/logical/reorderbuffer.c
Auto-merging src/backend/access/transam/xact.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xact.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 Do not count logical decoding cleanup aborts in xact_rollback
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".
=== using patch(1) to apply patch ./v2-logical-rollback-spike.patch ===
patching file src/backend/access/transam/twophase.c
patching file src/backend/access/transam/xact.c
Hunk #3 FAILED at 2524.
Hunk #4 FAILED at 3049.
Hunk #5 succeeded at 3522 (offset 3 lines).
2 out of 5 hunks FAILED -- saving rejects to file src/backend/access/transam/xact.c.rej
patching file src/backend/replication/logical/reorderbuffer.c
Hunk #1 succeeded at 2666 (offset -8 lines).
Hunk #2 succeeded at 2733 (offset -8 lines).
patching file src/backend/replication/logical/snapbuild.c
Hunk #1 succeeded at 617 (offset -14 lines).
patching file src/backend/utils/activity/pgstat_xact.c
patching file src/include/access/xact.h
patching file src/include/pgstat.h
Hunk #1 succeeded at 827 (offset 13 lines).
patching file src/test/subscription/meson.build
patching file src/test/subscription/t/039_publisher_xact_rollback.pl
Unstaged changes after reset:
M	src/backend/access/transam/twophase.c
M	src/backend/access/transam/xact.c
M	src/backend/replication/logical/reorderbuffer.c
M	src/backend/replication/logical/snapbuild.c
M	src/backend/utils/activity/pgstat_xact.c
M	src/include/access/xact.h
M	src/include/pgstat.h
M	src/test/subscription/meson.build
Removing src/backend/access/transam/xact.c.rej
Removing src/test/subscription/t/039_publisher_xact_rollback.pl
=== using 'git apply' to apply patch ./v2-logical-rollback-spike.patch ===
Applied patch to 'src/backend/access/transam/twophase.c' cleanly.
Applied patch to 'src/backend/access/transam/xact.c' with conflicts.
Applied patch to 'src/backend/replication/logical/reorderbuffer.c' cleanly.
Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly.
Applied patch to 'src/backend/utils/activity/pgstat_xact.c' cleanly.
Applied patch to 'src/include/access/xact.h' cleanly.
Applied patch to 'src/include/pgstat.h' cleanly.
Applied patch to 'src/test/subscription/meson.build' cleanly.
Falling back to direct application...
U src/backend/access/transam/xact.c
diff --cc src/backend/access/transam/xact.c
index 3a89149016f,35d5e174011..00000000000
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@@ -2514,8 -2524,7 +2524,12 @@@ CommitTransaction(void
  	AtEOXact_Files(true);
  	AtEOXact_ComboCid();
  	AtEOXact_HashTables(true);
++<<<<<<< ours
 +	AtEOXact_RI(true);
 +	AtEOXact_PgStat(true, is_parallel_worker);
++=======
+ 	AtEOXact_PgStat(true, is_parallel_worker, true);
++>>>>>>> theirs
  	AtEOXact_Snapshot(true, false);
  	AtEOXact_ApplyLauncher(true);
  	AtEOXact_LogicalRepWorkers(true);
@@@ -3041,8 -3049,7 +3055,12 @@@ AbortTransaction(void
  		AtEOXact_Files(false);
  		AtEOXact_ComboCid();
  		AtEOXact_HashTables(false);
++<<<<<<< ours
 +		AtEOXact_RI(false);
 +		AtEOXact_PgStat(false, is_parallel_worker);
++=======
+ 		AtEOXact_PgStat(false, is_parallel_worker, !xactSkipXactStats);
++>>>>>>> theirs
  		AtEOXact_ApplyLauncher(false);
  		AtEOXact_LogicalRepWorkers(false);
  		AtEOXact_LogicalCtl();