=== Applying patches on top of PostgreSQL commit ID c55df7c6eae5a5c6f91cd029fb91913db7f2089c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Apr 14 14:05:20 UTC 2025 On branch cf/4881 nothing to commit, working tree clean === using 'git am' to apply patch ./v16-0001-Implement-Eager-Aggregation.patch === Applying: Implement Eager Aggregation Using index info to reconstruct a base tree... M contrib/postgres_fdw/postgres_fdw.c M doc/src/sgml/config.sgml M src/backend/optimizer/README M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/initsplan.c M src/backend/optimizer/plan/planmain.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/util/appendinfo.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/nodes/pathnodes.h M src/include/optimizer/paths.h M src/include/optimizer/planmain.h M src/test/regress/expected/sysviews.out M src/test/regress/parallel_schedule 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/test/regress/parallel_schedule CONFLICT (content): Merge conflict in src/test/regress/parallel_schedule Auto-merging src/test/regress/expected/sysviews.out Auto-merging src/include/optimizer/planmain.h Auto-merging src/include/optimizer/paths.h Auto-merging src/include/nodes/pathnodes.h Auto-merging src/backend/utils/misc/postgresql.conf.sample CONFLICT (content): Merge conflict in src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/optimizer/util/appendinfo.c Auto-merging src/backend/optimizer/plan/planner.c Auto-merging src/backend/optimizer/plan/planmain.c Auto-merging src/backend/optimizer/plan/initsplan.c Auto-merging src/backend/optimizer/path/joinrels.c Auto-merging src/backend/optimizer/path/costsize.c Auto-merging src/backend/optimizer/path/allpaths.c Auto-merging src/backend/optimizer/README Auto-merging doc/src/sgml/config.sgml Auto-merging contrib/postgres_fdw/postgres_fdw.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 Implement Eager Aggregation 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 contrib/postgres_fdw/postgres_fdw.c M doc/src/sgml/config.sgml M src/backend/optimizer/README M src/backend/optimizer/geqo/geqo_eval.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/initsplan.c M src/backend/optimizer/plan/planmain.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/util/appendinfo.c M src/backend/optimizer/util/pathnode.c M src/backend/optimizer/util/relnode.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/include/optimizer/paths.h M src/include/optimizer/planmain.h M src/test/regress/expected/sysviews.out M src/test/regress/parallel_schedule M src/tools/pgindent/typedefs.list Removing src/test/regress/expected/eager_aggregate.out Removing src/test/regress/sql/eager_aggregate.sql === using patch(1) to apply patch ./v16-0001-Implement-Eager-Aggregation.patch === patching file contrib/postgres_fdw/postgres_fdw.c Hunk #1 succeeded at 6108 (offset 19 lines). patching file doc/src/sgml/config.sgml Hunk #1 succeeded at 5453 (offset 212 lines). patching file src/backend/optimizer/README Hunk #1 succeeded at 1501 (offset 4 lines). patching file src/backend/optimizer/geqo/geqo_eval.c patching file src/backend/optimizer/path/allpaths.c Hunk #9 succeeded at 1363 (offset 7 lines). Hunk #10 succeeded at 3413 (offset 19 lines). Hunk #11 succeeded at 3833 (offset 19 lines). Hunk #12 succeeded at 3885 (offset 19 lines). Hunk #13 succeeded at 3909 (offset 19 lines). Hunk #14 succeeded at 4799 (offset 20 lines). patching file src/backend/optimizer/path/costsize.c Hunk #2 succeeded at 3371 (offset -1 lines). Hunk #3 succeeded at 3856 (offset -1 lines). Hunk #4 succeeded at 4276 (offset -1 lines). Hunk #5 succeeded at 5036 (offset 9 lines). patching file src/backend/optimizer/path/joinrels.c Hunk #2 succeeded at 775 (offset 1 line). Hunk #3 succeeded at 890 (offset 1 line). Hunk #4 succeeded at 1811 (offset 1 line). patching file src/backend/optimizer/plan/initsplan.c patching file src/backend/optimizer/plan/planmain.c Hunk #3 succeeded at 272 (offset 5 lines). patching file src/backend/optimizer/plan/planner.c Hunk #1 succeeded at 231 (offset 2 lines). Hunk #2 succeeded at 3935 (offset 21 lines). Hunk #3 succeeded at 4017 (offset 21 lines). Hunk #4 succeeded at 6971 (offset 75 lines). Hunk #5 succeeded at 7119 (offset 75 lines). Hunk #6 succeeded at 7137 (offset 75 lines). Hunk #7 succeeded at 7145 (offset 75 lines). Hunk #8 succeeded at 7187 (offset 75 lines). Hunk #9 succeeded at 7247 (offset 75 lines). Hunk #10 succeeded at 7285 (offset 75 lines). Hunk #11 succeeded at 7314 (offset 75 lines). patching file src/backend/optimizer/util/appendinfo.c Hunk #1 succeeded at 516 (offset 17 lines). patching file src/backend/optimizer/util/pathnode.c patching file src/backend/optimizer/util/relnode.c patching file src/backend/utils/misc/guc_tables.c Hunk #1 succeeded at 949 (offset 20 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 FAILED at 416. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/postgresql.conf.sample.rej patching file src/include/nodes/pathnodes.h Hunk #2 succeeded at 313 (offset 24 lines). Hunk #3 succeeded at 417 (offset 24 lines). Hunk #4 succeeded at 670 (offset 27 lines). Hunk #5 succeeded at 737 (offset 27 lines). Hunk #6 succeeded at 1059 (offset 27 lines). Hunk #7 succeeded at 1138 (offset 27 lines). Hunk #8 succeeded at 3371 (offset 125 lines). patching file src/include/optimizer/pathnode.h patching file src/include/optimizer/paths.h patching file src/include/optimizer/planmain.h Hunk #1 succeeded at 76 (offset 1 line). patching file src/test/regress/expected/eager_aggregate.out patching file src/test/regress/expected/sysviews.out Hunk #2 FAILED at 172. 1 out of 2 hunks FAILED -- saving rejects to file src/test/regress/expected/sysviews.out.rej patching file src/test/regress/parallel_schedule Hunk #1 FAILED at 119. 1 out of 1 hunk FAILED -- saving rejects to file src/test/regress/parallel_schedule.rej patching file src/test/regress/sql/eager_aggregate.sql patching file src/tools/pgindent/typedefs.list Hunk #2 succeeded at 1102 (offset 35 lines). Hunk #3 succeeded at 1339 (offset 39 lines). Hunk #4 succeeded at 2463 (offset 78 lines). Unstaged changes after reset: M contrib/postgres_fdw/postgres_fdw.c M doc/src/sgml/config.sgml M src/backend/optimizer/README M src/backend/optimizer/geqo/geqo_eval.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/initsplan.c M src/backend/optimizer/plan/planmain.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/util/appendinfo.c M src/backend/optimizer/util/pathnode.c M src/backend/optimizer/util/relnode.c M src/backend/utils/misc/guc_tables.c M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/include/optimizer/paths.h M src/include/optimizer/planmain.h M src/test/regress/expected/sysviews.out M src/tools/pgindent/typedefs.list Removing src/backend/utils/misc/postgresql.conf.sample.rej Removing src/test/regress/expected/eager_aggregate.out Removing src/test/regress/expected/sysviews.out.rej Removing src/test/regress/parallel_schedule.rej Removing src/test/regress/sql/eager_aggregate.sql === using 'git apply' to apply patch ./v16-0001-Implement-Eager-Aggregation.patch === Applied patch to 'contrib/postgres_fdw/postgres_fdw.c' cleanly. Applied patch to 'doc/src/sgml/config.sgml' cleanly. Applied patch to 'src/backend/optimizer/README' cleanly. Applied patch to 'src/backend/optimizer/geqo/geqo_eval.c' cleanly. Applied patch to 'src/backend/optimizer/path/allpaths.c' cleanly. Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly. Applied patch to 'src/backend/optimizer/path/joinrels.c' cleanly. Applied patch to 'src/backend/optimizer/plan/initsplan.c' cleanly. Applied patch to 'src/backend/optimizer/plan/planmain.c' cleanly. Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly. Applied patch to 'src/backend/optimizer/util/appendinfo.c' cleanly. Applied patch to 'src/backend/optimizer/util/pathnode.c' cleanly. Applied patch to 'src/backend/optimizer/util/relnode.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' with conflicts. Applied patch to 'src/include/nodes/pathnodes.h' cleanly. Applied patch to 'src/include/optimizer/pathnode.h' cleanly. Applied patch to 'src/include/optimizer/paths.h' cleanly. Applied patch to 'src/include/optimizer/planmain.h' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/sysviews.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' with conflicts. Falling back to direct application... Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/backend/utils/misc/postgresql.conf.sample U src/test/regress/parallel_schedule diff --cc src/backend/utils/misc/postgresql.conf.sample index 34826d01380,e142d37c708..00000000000 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@@ -431,7 -416,7 +431,11 @@@ #enable_tidscan = on #enable_group_by_reordering = on #enable_distinct_reordering = on ++<<<<<<< ours +#enable_self_join_elimination = on ++======= + #enable_eager_aggregate = off ++>>>>>>> theirs # - Planner Cost Constants - diff --cc src/test/regress/parallel_schedule index 0f38caa0d24,4fc210e2ef9..00000000000 --- a/src/test/regress/parallel_schedule +++ b/src/test/regress/parallel_schedule @@@ -119,7 -119,7 +119,11 @@@ test: plancache limit plpgsql copy2 tem # The stats test resets stats, so nothing else needing stats access can be in # this group. # ---------- ++<<<<<<< ours +test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain compression memoize stats predicate numa ++======= + test: partition_join partition_prune reloptions hash_part indexing partition_aggregate partition_info tuplesort explain compression memoize stats predicate eager_aggregate ++>>>>>>> theirs # event_trigger depends on create_am and cannot run concurrently with # any test that runs DDL