=== Applying patches on top of PostgreSQL commit ID a359d3701991d040bf7b66cfa7052546eb923c38 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Mar 14 13:10:24 UTC 2025
On branch cf/5473
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v8-0001-Proposal-for-progressive-explains.patch ===
Applying: Proposal for progressive explains
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	doc/src/sgml/monitoring.sgml
M	doc/src/sgml/perform.sgml
M	src/backend/commands/explain.c
M	src/backend/storage/lmgr/lwlock.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/backend/utils/init/postinit.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/catalog/pg_proc.dat
M	src/include/nodes/execnodes.h
M	src/include/storage/lwlock.h
M	src/include/utils/guc.h
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/include/utils/guc.h
Auto-merging src/include/storage/lwlock.h
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/utils/init/postinit.c
Auto-merging src/backend/utils/activity/wait_event_names.txt
Auto-merging src/backend/storage/lmgr/lwlock.c
Auto-merging src/backend/commands/explain.c
CONFLICT (content): Merge conflict in src/backend/commands/explain.c
Auto-merging doc/src/sgml/perform.sgml
Auto-merging doc/src/sgml/monitoring.sgml
Auto-merging doc/src/sgml/config.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 Proposal for progressive explains
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/config.sgml
M	doc/src/sgml/monitoring.sgml
M	doc/src/sgml/perform.sgml
M	src/backend/catalog/system_views.sql
M	src/backend/commands/explain.c
M	src/backend/executor/execMain.c
M	src/backend/executor/execProcnode.c
M	src/backend/executor/instrument.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/lmgr/lwlock.c
M	src/backend/utils/activity/wait_event_names.txt
M	src/backend/utils/init/postinit.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/catalog/pg_proc.dat
M	src/include/commands/explain.h
M	src/include/executor/execdesc.h
M	src/include/executor/instrument.h
M	src/include/nodes/execnodes.h
M	src/include/storage/lwlock.h
M	src/include/storage/lwlocklist.h
M	src/include/utils/guc.h
M	src/include/utils/timeout.h
M	src/test/regress/expected/rules.out
M	src/tools/pgindent/typedefs.list
Removing src/test/modules/test_misc/t/008_progressive_explain.pl
=== using patch(1) to apply patch ./v8-0001-Proposal-for-progressive-explains.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 ./v8-0001-Proposal-for-progressive-explains.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly.
Applied patch to 'doc/src/sgml/perform.sgml' cleanly.
Applied patch to 'src/backend/catalog/system_views.sql' cleanly.
Applied patch to 'src/backend/commands/explain.c' with conflicts.
Applied patch to 'src/backend/executor/execMain.c' cleanly.
Applied patch to 'src/backend/executor/execProcnode.c' cleanly.
Applied patch to 'src/backend/executor/instrument.c' cleanly.
Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/lwlock.c' cleanly.
Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly.
Applied patch to 'src/backend/utils/init/postinit.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/include/catalog/pg_proc.dat' cleanly.
Applied patch to 'src/include/commands/explain.h' cleanly.
Applied patch to 'src/include/executor/execdesc.h' cleanly.
Applied patch to 'src/include/executor/instrument.h' cleanly.
Applied patch to 'src/include/nodes/execnodes.h' cleanly.
Applied patch to 'src/include/storage/lwlock.h' cleanly.
Applied patch to 'src/include/storage/lwlocklist.h' cleanly.
Applied patch to 'src/include/utils/guc.h' cleanly.
Applied patch to 'src/include/utils/timeout.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/rules.out' cleanly.
Applied patch to 'src/tools/pgindent/typedefs.list' cleanly.
U src/backend/commands/explain.c
diff --cc src/backend/commands/explain.c
index 19ffcc2cacb,0ff07d39e9b..00000000000
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@@ -2101,8 -2146,7 +2152,12 @@@ ExplainNode(PlanState *planstate, List 
  			show_scan_qual(plan->qual, "Filter", planstate, ancestors, es);
  			if (plan->qual)
  				show_instrumentation_count("Rows Removed by Filter", 1,
++<<<<<<< ours
 +										   planstate, es);
 +			show_indexsearches_info(planstate, es);
++=======
+ 										   local_instr, es);
++>>>>>>> theirs
  			break;
  		case T_IndexOnlyScan:
  			show_scan_qual(((IndexOnlyScan *) plan)->indexqual,
@@@ -2115,11 -2159,10 +2170,15 @@@
  			show_scan_qual(plan->qual, "Filter", planstate, ancestors, es);
  			if (plan->qual)
  				show_instrumentation_count("Rows Removed by Filter", 1,
- 										   planstate, es);
+ 										   local_instr, es);
  			if (es->analyze)
  				ExplainPropertyFloat("Heap Fetches", NULL,
++<<<<<<< ours
 +									 planstate->instrument->ntuples2, 0, es);
 +			show_indexsearches_info(planstate, es);
++=======
+ 									 local_instr->ntuples2, 0, es);
++>>>>>>> theirs
  			break;
  		case T_BitmapIndexScan:
  			show_scan_qual(((BitmapIndexScan *) plan)->indexqualorig,
@@@ -2335,16 -2377,15 +2394,22 @@@
  			show_hashagg_info((AggState *) planstate, es);
  			if (plan->qual)
  				show_instrumentation_count("Rows Removed by Filter", 1,
- 										   planstate, es);
+ 										   local_instr, es);
  			break;
  		case T_WindowAgg:
 +			show_window_def(castNode(WindowAggState, planstate), ancestors, es);
 +			show_upper_qual(((WindowAgg *) plan)->runConditionOrig,
 +							"Run Condition", planstate, ancestors, es);
  			show_upper_qual(plan->qual, "Filter", planstate, ancestors, es);
  			if (plan->qual)
  				show_instrumentation_count("Rows Removed by Filter", 1,
++<<<<<<< ours
 +										   planstate, es);
++=======
+ 										   local_instr, es);
+ 			show_upper_qual(((WindowAgg *) plan)->runConditionOrig,
+ 							"Run Condition", planstate, ancestors, es);
++>>>>>>> theirs
  			show_windowagg_info(castNode(WindowAggState, planstate), es);
  			break;
  		case T_Group: