=== Applying patches on top of PostgreSQL commit ID 9863c90759ecb3c200520db9a8b02c33eaec6e17 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Feb 11 23:13:24 UTC 2026 On branch cf/4904 nothing to commit, working tree clean === using 'git am' to apply patch ./v20260113-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch === Applying: WIP: SQL Property Graph Queries (SQL/PGQ) Using index info to reconstruct a base tree... M contrib/pg_overexplain/expected/pg_overexplain.out M contrib/pg_overexplain/pg_overexplain.c M contrib/pg_overexplain/sql/pg_overexplain.sql M doc/src/sgml/catalogs.sgml M doc/src/sgml/func/func-info.sgml M doc/src/sgml/ref/psql-ref.sgml M src/backend/commands/alter.c M src/backend/commands/seclabel.c M src/backend/executor/execMain.c M src/backend/nodes/nodeFuncs.c M src/backend/nodes/outfuncs.c M src/backend/nodes/readfuncs.c M src/backend/optimizer/path/allpaths.c M src/backend/parser/parse_expr.c M src/backend/parser/scan.l M src/backend/utils/adt/ruleutils.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/t/002_pg_dump.pl M src/include/catalog/pg_proc.dat M src/include/nodes/parsenodes.h M src/test/regress/expected/oidjoins.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 Auto-merging src/test/regress/expected/oidjoins.out Auto-merging src/include/nodes/parsenodes.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/bin/pg_dump/t/002_pg_dump.pl Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/bin/pg_dump/pg_backup_archiver.c Auto-merging src/backend/utils/adt/ruleutils.c Auto-merging src/backend/parser/scan.l Auto-merging src/backend/parser/parse_expr.c Auto-merging src/backend/optimizer/path/allpaths.c Auto-merging src/backend/nodes/readfuncs.c Auto-merging src/backend/nodes/outfuncs.c Auto-merging src/backend/nodes/nodeFuncs.c Auto-merging src/backend/executor/execMain.c Auto-merging src/backend/commands/seclabel.c Auto-merging src/backend/commands/alter.c Auto-merging doc/src/sgml/ref/psql-ref.sgml Auto-merging doc/src/sgml/func/func-info.sgml Auto-merging doc/src/sgml/catalogs.sgml Auto-merging contrib/pg_overexplain/sql/pg_overexplain.sql CONFLICT (content): Merge conflict in contrib/pg_overexplain/sql/pg_overexplain.sql Auto-merging contrib/pg_overexplain/pg_overexplain.c Auto-merging contrib/pg_overexplain/expected/pg_overexplain.out CONFLICT (content): Merge conflict in contrib/pg_overexplain/expected/pg_overexplain.out error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 WIP: SQL Property Graph Queries (SQL/PGQ) 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/pg_overexplain/expected/pg_overexplain.out M contrib/pg_overexplain/pg_overexplain.c M contrib/pg_overexplain/sql/pg_overexplain.sql M doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/features.sgml M doc/src/sgml/func/func-info.sgml M doc/src/sgml/information_schema.sgml M doc/src/sgml/queries.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/alter_extension.sgml M doc/src/sgml/ref/comment.sgml M doc/src/sgml/ref/grant.sgml M doc/src/sgml/ref/psql-ref.sgml M doc/src/sgml/ref/revoke.sgml M doc/src/sgml/ref/security_label.sgml M doc/src/sgml/ref/select.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/information_schema.sql M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_class.c M src/backend/catalog/sql_features.txt M src/backend/commands/Makefile M src/backend/commands/alter.c M src/backend/commands/dropcmds.c M src/backend/commands/event_trigger.c M src/backend/commands/meson.build M src/backend/commands/seclabel.c M src/backend/commands/tablecmds.c M src/backend/executor/execMain.c M src/backend/nodes/nodeFuncs.c M src/backend/nodes/outfuncs.c M src/backend/nodes/print.c M src/backend/nodes/readfuncs.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/prep/prepjointree.c M src/backend/parser/Makefile M src/backend/parser/analyze.c M src/backend/parser/gram.y M src/backend/parser/meson.build M src/backend/parser/parse_agg.c M src/backend/parser/parse_clause.c M src/backend/parser/parse_collate.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/backend/parser/scan.l M src/backend/rewrite/Makefile M src/backend/rewrite/meson.build M src/backend/rewrite/rewriteHandler.c M src/backend/tcop/utility.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/backend/utils/cache/plancache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/command.c M src/bin/psql/describe.c M src/bin/psql/help.c M src/bin/psql/tab-complete.in.c M src/fe_utils/psqlscan.l M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/catalog/pg_class.h M src/include/catalog/pg_proc.dat M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/parser/analyze.h M src/include/parser/kwlist.h M src/include/parser/parse_node.h M src/include/parser/parse_relation.h M src/include/tcop/cmdtaglist.h M src/include/utils/acl.h M src/include/utils/lsyscache.h M src/interfaces/ecpg/preproc/pgc.l M src/interfaces/ecpg/test/ecpg_schedule M src/interfaces/ecpg/test/sql/Makefile M src/interfaces/ecpg/test/sql/meson.build M src/test/regress/expected/alter_generic.out M src/test/regress/expected/object_address.out M src/test/regress/expected/oidjoins.out M src/test/regress/expected/privileges.out M src/test/regress/parallel_schedule M src/test/regress/sql/alter_generic.sql M src/test/regress/sql/object_address.sql M src/test/regress/sql/privileges.sql M src/tools/pgindent/typedefs.list Removing doc/src/sgml/keywords/sql2023-16-nonreserved.txt Removing doc/src/sgml/keywords/sql2023-16-reserved.txt Removing doc/src/sgml/ref/alter_property_graph.sgml Removing doc/src/sgml/ref/create_property_graph.sgml Removing doc/src/sgml/ref/drop_property_graph.sgml Removing src/backend/commands/propgraphcmds.c Removing src/backend/parser/parse_graphtable.c Removing src/backend/rewrite/rewriteGraphTable.c Removing src/include/catalog/pg_propgraph_element.h Removing src/include/catalog/pg_propgraph_element_label.h Removing src/include/catalog/pg_propgraph_label.h Removing src/include/catalog/pg_propgraph_label_property.h Removing src/include/catalog/pg_propgraph_property.h Removing src/include/commands/propgraphcmds.h Removing src/include/parser/parse_graphtable.h Removing src/include/rewrite/rewriteGraphTable.h Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.c Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stderr Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stdout Removing src/interfaces/ecpg/test/sql/sqlpgq.pgc Removing src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/graph_table.out Removing src/test/regress/expected/graph_table_rls.out Removing src/test/regress/sql/create_property_graph.sql Removing src/test/regress/sql/graph_table.sql Removing src/test/regress/sql/graph_table_rls.sql === using patch(1) to apply patch ./v20260113-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch === patching file contrib/pg_overexplain/expected/pg_overexplain.out Hunk #1 succeeded at 612 with fuzz 2 (offset 123 lines). patching file contrib/pg_overexplain/pg_overexplain.c Hunk #1 succeeded at 504 (offset 61 lines). Hunk #2 succeeded at 628 (offset 83 lines). Hunk #3 succeeded at 753 (offset 83 lines). patching file contrib/pg_overexplain/sql/pg_overexplain.sql Hunk #1 FAILED at 110. 1 out of 1 hunk FAILED -- saving rejects to file contrib/pg_overexplain/sql/pg_overexplain.sql.rej patching file doc/src/sgml/catalogs.sgml patching file doc/src/sgml/ddl.sgml patching file doc/src/sgml/features.sgml patching file doc/src/sgml/func/func-info.sgml Hunk #1 succeeded at 1660 (offset -2 lines). patching file doc/src/sgml/information_schema.sgml patching file doc/src/sgml/keywords/sql2023-16-nonreserved.txt patching file doc/src/sgml/keywords/sql2023-16-reserved.txt patching file doc/src/sgml/queries.sgml patching file doc/src/sgml/ref/allfiles.sgml patching file doc/src/sgml/ref/alter_extension.sgml patching file doc/src/sgml/ref/alter_property_graph.sgml patching file doc/src/sgml/ref/comment.sgml patching file doc/src/sgml/ref/create_property_graph.sgml patching file doc/src/sgml/ref/drop_property_graph.sgml patching file doc/src/sgml/ref/grant.sgml patching file doc/src/sgml/ref/psql-ref.sgml patching file doc/src/sgml/ref/revoke.sgml patching file doc/src/sgml/ref/security_label.sgml patching file doc/src/sgml/ref/select.sgml patching file doc/src/sgml/reference.sgml patching file src/backend/catalog/aclchk.c patching file src/backend/catalog/dependency.c patching file src/backend/catalog/information_schema.sql patching file src/backend/catalog/objectaddress.c patching file src/backend/catalog/pg_class.c patching file src/backend/catalog/sql_features.txt patching file src/backend/commands/Makefile patching file src/backend/commands/alter.c Hunk #1 succeeded at 390 (offset -6 lines). Hunk #2 succeeded at 544 (offset -6 lines). Hunk #3 succeeded at 878 (offset -6 lines). Hunk #4 succeeded at 887 (offset -6 lines). patching file src/backend/commands/dropcmds.c patching file src/backend/commands/event_trigger.c patching file src/backend/commands/meson.build patching file src/backend/commands/propgraphcmds.c patching file src/backend/commands/seclabel.c patching file src/backend/commands/tablecmds.c patching file src/backend/executor/execMain.c Hunk #2 succeeded at 1163 (offset 4 lines). Hunk #3 succeeded at 1233 (offset 4 lines). patching file src/backend/nodes/nodeFuncs.c patching file src/backend/nodes/outfuncs.c patching file src/backend/nodes/print.c patching file src/backend/nodes/readfuncs.c Hunk #1 succeeded at 423 (offset -2 lines). patching file src/backend/optimizer/path/allpaths.c Hunk #1 succeeded at 787 (offset 2 lines). patching file src/backend/optimizer/prep/prepjointree.c patching file src/backend/parser/Makefile patching file src/backend/parser/analyze.c patching file src/backend/parser/gram.y patching file src/backend/parser/meson.build patching file src/backend/parser/parse_agg.c patching file src/backend/parser/parse_clause.c patching file src/backend/parser/parse_collate.c patching file src/backend/parser/parse_expr.c Hunk #4 succeeded at 1877 (offset 9 lines). Hunk #5 succeeded at 3239 (offset 9 lines). patching file src/backend/parser/parse_func.c patching file src/backend/parser/parse_graphtable.c patching file src/backend/parser/parse_relation.c patching file src/backend/parser/parse_target.c patching file src/backend/parser/scan.l Hunk #1 succeeded at 348 (offset -4 lines). Hunk #2 succeeded at 361 (offset -4 lines). Hunk #3 succeeded at 855 (offset -25 lines). Hunk #4 succeeded at 937 (offset -25 lines). Hunk #5 succeeded at 957 (offset -25 lines). patching file src/backend/rewrite/Makefile patching file src/backend/rewrite/meson.build patching file src/backend/rewrite/rewriteGraphTable.c patching file src/backend/rewrite/rewriteHandler.c patching file src/backend/tcop/utility.c patching file src/backend/utils/adt/ruleutils.c Hunk #7 succeeded at 13025 (offset -2 lines). patching file src/backend/utils/cache/lsyscache.c patching file src/backend/utils/cache/plancache.c patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/pg_backup_archiver.c Hunk #1 succeeded at 3808 (offset -1 lines). patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 1866 (offset -2 lines). Hunk #2 succeeded at 3046 (offset -2 lines). Hunk #4 succeeded at 17138 (offset 4 lines). Hunk #5 succeeded at 17163 (offset 4 lines). Hunk #6 succeeded at 17279 (offset 4 lines). Hunk #7 succeeded at 18019 (offset 4 lines). Hunk #8 succeeded at 20302 (offset 232 lines). patching file src/bin/pg_dump/t/002_pg_dump.pl patching file src/bin/psql/command.c patching file src/bin/psql/describe.c patching file src/bin/psql/help.c patching file src/bin/psql/tab-complete.in.c patching file src/fe_utils/psqlscan.l patching file src/include/catalog/Makefile patching file src/include/catalog/meson.build patching file src/include/catalog/pg_class.h patching file src/include/catalog/pg_proc.dat patching file src/include/catalog/pg_propgraph_element.h patching file src/include/catalog/pg_propgraph_element_label.h patching file src/include/catalog/pg_propgraph_label.h patching file src/include/catalog/pg_propgraph_label_property.h patching file src/include/catalog/pg_propgraph_property.h patching file src/include/commands/propgraphcmds.h patching file src/include/nodes/parsenodes.h patching file src/include/nodes/primnodes.h patching file src/include/parser/analyze.h patching file src/include/parser/kwlist.h patching file src/include/parser/parse_graphtable.h patching file src/include/parser/parse_node.h patching file src/include/parser/parse_relation.h patching file src/include/rewrite/rewriteGraphTable.h patching file src/include/tcop/cmdtaglist.h patching file src/include/utils/acl.h patching file src/include/utils/lsyscache.h patching file src/interfaces/ecpg/preproc/pgc.l patching file src/interfaces/ecpg/test/ecpg_schedule patching file src/interfaces/ecpg/test/expected/sql-sqlpgq.c patching file src/interfaces/ecpg/test/expected/sql-sqlpgq.stderr patching file src/interfaces/ecpg/test/expected/sql-sqlpgq.stdout patching file src/interfaces/ecpg/test/sql/Makefile patching file src/interfaces/ecpg/test/sql/meson.build patching file src/interfaces/ecpg/test/sql/sqlpgq.pgc patching file src/test/regress/expected/alter_generic.out patching file src/test/regress/expected/create_property_graph.out patching file src/test/regress/expected/graph_table.out patching file src/test/regress/expected/graph_table_rls.out patching file src/test/regress/expected/object_address.out patching file src/test/regress/expected/oidjoins.out Hunk #1 succeeded at 271 (offset 5 lines). patching file src/test/regress/expected/privileges.out patching file src/test/regress/parallel_schedule patching file src/test/regress/sql/alter_generic.sql patching file src/test/regress/sql/create_property_graph.sql patching file src/test/regress/sql/graph_table.sql patching file src/test/regress/sql/graph_table_rls.sql patching file src/test/regress/sql/object_address.sql patching file src/test/regress/sql/privileges.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 4426 (offset 20 lines). Unstaged changes after reset: M contrib/pg_overexplain/expected/pg_overexplain.out M contrib/pg_overexplain/pg_overexplain.c M doc/src/sgml/catalogs.sgml M doc/src/sgml/ddl.sgml M doc/src/sgml/features.sgml M doc/src/sgml/func/func-info.sgml M doc/src/sgml/information_schema.sgml M doc/src/sgml/queries.sgml M doc/src/sgml/ref/allfiles.sgml M doc/src/sgml/ref/alter_extension.sgml M doc/src/sgml/ref/comment.sgml M doc/src/sgml/ref/grant.sgml M doc/src/sgml/ref/psql-ref.sgml M doc/src/sgml/ref/revoke.sgml M doc/src/sgml/ref/security_label.sgml M doc/src/sgml/ref/select.sgml M doc/src/sgml/reference.sgml M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/information_schema.sql M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_class.c M src/backend/catalog/sql_features.txt M src/backend/commands/Makefile M src/backend/commands/alter.c M src/backend/commands/dropcmds.c M src/backend/commands/event_trigger.c M src/backend/commands/meson.build M src/backend/commands/seclabel.c M src/backend/commands/tablecmds.c M src/backend/executor/execMain.c M src/backend/nodes/nodeFuncs.c M src/backend/nodes/outfuncs.c M src/backend/nodes/print.c M src/backend/nodes/readfuncs.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/prep/prepjointree.c M src/backend/parser/Makefile M src/backend/parser/analyze.c M src/backend/parser/gram.y M src/backend/parser/meson.build M src/backend/parser/parse_agg.c M src/backend/parser/parse_clause.c M src/backend/parser/parse_collate.c M src/backend/parser/parse_expr.c M src/backend/parser/parse_func.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/backend/parser/scan.l M src/backend/rewrite/Makefile M src/backend/rewrite/meson.build M src/backend/rewrite/rewriteHandler.c M src/backend/tcop/utility.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/lsyscache.c M src/backend/utils/cache/plancache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_backup_archiver.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/t/002_pg_dump.pl M src/bin/psql/command.c M src/bin/psql/describe.c M src/bin/psql/help.c M src/bin/psql/tab-complete.in.c M src/fe_utils/psqlscan.l M src/include/catalog/Makefile M src/include/catalog/meson.build M src/include/catalog/pg_class.h M src/include/catalog/pg_proc.dat M src/include/nodes/parsenodes.h M src/include/nodes/primnodes.h M src/include/parser/analyze.h M src/include/parser/kwlist.h M src/include/parser/parse_node.h M src/include/parser/parse_relation.h M src/include/tcop/cmdtaglist.h M src/include/utils/acl.h M src/include/utils/lsyscache.h M src/interfaces/ecpg/preproc/pgc.l M src/interfaces/ecpg/test/ecpg_schedule M src/interfaces/ecpg/test/sql/Makefile M src/interfaces/ecpg/test/sql/meson.build M src/test/regress/expected/alter_generic.out M src/test/regress/expected/object_address.out M src/test/regress/expected/oidjoins.out M src/test/regress/expected/privileges.out M src/test/regress/parallel_schedule M src/test/regress/sql/alter_generic.sql M src/test/regress/sql/object_address.sql M src/test/regress/sql/privileges.sql M src/tools/pgindent/typedefs.list Removing contrib/pg_overexplain/sql/pg_overexplain.sql.rej Removing doc/src/sgml/keywords/sql2023-16-nonreserved.txt Removing doc/src/sgml/keywords/sql2023-16-reserved.txt Removing doc/src/sgml/ref/alter_property_graph.sgml Removing doc/src/sgml/ref/create_property_graph.sgml Removing doc/src/sgml/ref/drop_property_graph.sgml Removing src/backend/commands/propgraphcmds.c Removing src/backend/parser/parse_graphtable.c Removing src/backend/rewrite/rewriteGraphTable.c Removing src/include/catalog/pg_propgraph_element.h Removing src/include/catalog/pg_propgraph_element_label.h Removing src/include/catalog/pg_propgraph_label.h Removing src/include/catalog/pg_propgraph_label_property.h Removing src/include/catalog/pg_propgraph_property.h Removing src/include/commands/propgraphcmds.h Removing src/include/parser/parse_graphtable.h Removing src/include/rewrite/rewriteGraphTable.h Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.c Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stderr Removing src/interfaces/ecpg/test/expected/sql-sqlpgq.stdout Removing src/interfaces/ecpg/test/sql/sqlpgq.pgc Removing src/test/regress/expected/create_property_graph.out Removing src/test/regress/expected/graph_table.out Removing src/test/regress/expected/graph_table_rls.out Removing src/test/regress/sql/create_property_graph.sql Removing src/test/regress/sql/graph_table.sql Removing src/test/regress/sql/graph_table_rls.sql === using 'git apply' to apply patch ./v20260113-0001-WIP-SQL-Property-Graph-Queries-SQL-PGQ.patch === Applied patch to 'contrib/pg_overexplain/expected/pg_overexplain.out' with conflicts. Applied patch to 'contrib/pg_overexplain/pg_overexplain.c' cleanly. Applied patch to 'contrib/pg_overexplain/sql/pg_overexplain.sql' with conflicts. Applied patch to 'doc/src/sgml/catalogs.sgml' cleanly. Applied patch to 'doc/src/sgml/ddl.sgml' cleanly. Applied patch to 'doc/src/sgml/features.sgml' cleanly. Applied patch to 'doc/src/sgml/func/func-info.sgml' cleanly. Applied patch to 'doc/src/sgml/information_schema.sgml' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/queries.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/allfiles.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/alter_extension.sgml' cleanly. Falling back to direct application... Applied patch to 'doc/src/sgml/ref/comment.sgml' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'doc/src/sgml/ref/grant.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/psql-ref.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/revoke.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/security_label.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/select.sgml' cleanly. Applied patch to 'doc/src/sgml/reference.sgml' cleanly. Applied patch to 'src/backend/catalog/aclchk.c' cleanly. Applied patch to 'src/backend/catalog/dependency.c' cleanly. Applied patch to 'src/backend/catalog/information_schema.sql' cleanly. Applied patch to 'src/backend/catalog/objectaddress.c' cleanly. Applied patch to 'src/backend/catalog/pg_class.c' cleanly. Applied patch to 'src/backend/catalog/sql_features.txt' cleanly. Applied patch to 'src/backend/commands/Makefile' cleanly. Applied patch to 'src/backend/commands/alter.c' cleanly. Applied patch to 'src/backend/commands/dropcmds.c' cleanly. Applied patch to 'src/backend/commands/event_trigger.c' cleanly. Applied patch to 'src/backend/commands/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/backend/commands/seclabel.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/executor/execMain.c' cleanly. Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly. Applied patch to 'src/backend/nodes/outfuncs.c' cleanly. Applied patch to 'src/backend/nodes/print.c' cleanly. Applied patch to 'src/backend/nodes/readfuncs.c' cleanly. Applied patch to 'src/backend/optimizer/path/allpaths.c' cleanly. Applied patch to 'src/backend/optimizer/prep/prepjointree.c' cleanly. Applied patch to 'src/backend/parser/Makefile' cleanly. Applied patch to 'src/backend/parser/analyze.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/meson.build' cleanly. Applied patch to 'src/backend/parser/parse_agg.c' cleanly. Applied patch to 'src/backend/parser/parse_clause.c' cleanly. Applied patch to 'src/backend/parser/parse_collate.c' cleanly. Applied patch to 'src/backend/parser/parse_expr.c' cleanly. Applied patch to 'src/backend/parser/parse_func.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/parser/parse_relation.c' cleanly. Applied patch to 'src/backend/parser/parse_target.c' cleanly. Applied patch to 'src/backend/parser/scan.l' cleanly. Applied patch to 'src/backend/rewrite/Makefile' cleanly. Applied patch to 'src/backend/rewrite/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/backend/rewrite/rewriteHandler.c' cleanly. Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/backend/utils/cache/lsyscache.c' cleanly. Applied patch to 'src/backend/utils/cache/plancache.c' cleanly. Applied patch to 'src/bin/pg_dump/common.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/psql/command.c' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/bin/psql/help.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/fe_utils/psqlscan.l' cleanly. Applied patch to 'src/include/catalog/Makefile' cleanly. Applied patch to 'src/include/catalog/meson.build' cleanly. Applied patch to 'src/include/catalog/pg_class.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/nodes/primnodes.h' cleanly. Applied patch to 'src/include/parser/analyze.h' cleanly. Applied patch to 'src/include/parser/kwlist.h' cleanly. Falling back to direct application... Applied patch to 'src/include/parser/parse_node.h' cleanly. Applied patch to 'src/include/parser/parse_relation.h' cleanly. Falling back to direct application... Applied patch to 'src/include/tcop/cmdtaglist.h' cleanly. Applied patch to 'src/include/utils/acl.h' cleanly. Applied patch to 'src/include/utils/lsyscache.h' cleanly. Applied patch to 'src/interfaces/ecpg/preproc/pgc.l' cleanly. Applied patch to 'src/interfaces/ecpg/test/ecpg_schedule' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/interfaces/ecpg/test/sql/Makefile' cleanly. Applied patch to 'src/interfaces/ecpg/test/sql/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/alter_generic.out' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/expected/object_address.out' cleanly. Applied patch to 'src/test/regress/expected/oidjoins.out' cleanly. Applied patch to 'src/test/regress/expected/privileges.out' cleanly. Applied patch to 'src/test/regress/parallel_schedule' cleanly. Applied patch to 'src/test/regress/sql/alter_generic.sql' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/regress/sql/object_address.sql' cleanly. Applied patch to 'src/test/regress/sql/privileges.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U contrib/pg_overexplain/expected/pg_overexplain.out U contrib/pg_overexplain/sql/pg_overexplain.sql diff --cc contrib/pg_overexplain/expected/pg_overexplain.out index f376d2e7996,643629296e6..00000000000 --- a/contrib/pg_overexplain/expected/pg_overexplain.out +++ b/contrib/pg_overexplain/expected/pg_overexplain.out @@@ -493,122 -489,50 +493,171 @@@ INSERT INTO vegetables (name, genus) VA Result RTIs: 1 (15 rows) ++<<<<<<< ours +-- should show "Subplan: sub" +EXPLAIN (RANGE_TABLE, COSTS OFF) +SELECT * FROM vegetables v, + (SELECT * FROM vegetables WHERE genus = 'daucus' OFFSET 0) sub; + QUERY PLAN +---------------------------------------------- + Nested Loop + -> Seq Scan on daucus vegetables + Filter: (genus = 'daucus'::text) + Scan RTI: 6 + Elided Node Type: Append + Elided Node RTIs: 5 + Elided Node Type: SubqueryScan + Elided Node RTIs: 2 + -> Append + Append RTIs: 1 + Child Append RTIs: none + -> Seq Scan on brassica v_1 + Scan RTI: 3 + -> Seq Scan on daucus v_2 + Scan RTI: 4 + RTI 1 (relation, inherited, in-from-clause): + Alias: v () + Eref: v (id, name, genus) + Relation: vegetables + Relation Kind: partitioned_table + Relation Lock Mode: AccessShareLock + Permission Info Index: 1 + RTI 2 (subquery, in-from-clause): + Alias: sub () + Eref: sub (id, name, genus) + RTI 3 (relation, in-from-clause): + Alias: v (id, name, genus) + Eref: v (id, name, genus) + Relation: brassica + Relation Kind: relation + Relation Lock Mode: AccessShareLock + RTI 4 (relation, in-from-clause): + Alias: v (id, name, genus) + Eref: v (id, name, genus) + Relation: daucus + Relation Kind: relation + Relation Lock Mode: AccessShareLock + RTI 5 (relation, inherited, in-from-clause): + Subplan: sub + Eref: vegetables (id, name, genus) + Relation: vegetables + Relation Kind: partitioned_table + Relation Lock Mode: AccessShareLock + Permission Info Index: 2 + RTI 6 (relation, in-from-clause): + Subplan: sub + Alias: vegetables (id, name, genus) + Eref: vegetables (id, name, genus) + Relation: daucus + Relation Kind: relation + Relation Lock Mode: AccessShareLock + Unprunable RTIs: 1 3 4 5 6 +(52 rows) + +-- should show "Subplan: unnamed_subquery" +EXPLAIN (RANGE_TABLE, COSTS OFF) +SELECT * FROM vegetables v, + (SELECT * FROM vegetables WHERE genus = 'daucus' OFFSET 0); + QUERY PLAN +---------------------------------------------- + Nested Loop + -> Seq Scan on daucus vegetables + Filter: (genus = 'daucus'::text) + Scan RTI: 6 + Elided Node Type: Append + Elided Node RTIs: 5 + Elided Node Type: SubqueryScan + Elided Node RTIs: 2 + -> Append + Append RTIs: 1 + Child Append RTIs: none + -> Seq Scan on brassica v_1 + Scan RTI: 3 + -> Seq Scan on daucus v_2 + Scan RTI: 4 + RTI 1 (relation, inherited, in-from-clause): + Alias: v () + Eref: v (id, name, genus) + Relation: vegetables + Relation Kind: partitioned_table + Relation Lock Mode: AccessShareLock + Permission Info Index: 1 + RTI 2 (subquery, in-from-clause): + Eref: unnamed_subquery (id, name, genus) + RTI 3 (relation, in-from-clause): + Alias: v (id, name, genus) + Eref: v (id, name, genus) + Relation: brassica + Relation Kind: relation + Relation Lock Mode: AccessShareLock + RTI 4 (relation, in-from-clause): + Alias: v (id, name, genus) + Eref: v (id, name, genus) + Relation: daucus + Relation Kind: relation + Relation Lock Mode: AccessShareLock + RTI 5 (relation, inherited, in-from-clause): + Subplan: unnamed_subquery + Eref: vegetables (id, name, genus) + Relation: vegetables + Relation Kind: partitioned_table + Relation Lock Mode: AccessShareLock + Permission Info Index: 2 + RTI 6 (relation, in-from-clause): + Subplan: unnamed_subquery + Alias: vegetables (id, name, genus) + Eref: vegetables (id, name, genus) + Relation: daucus + Relation Kind: relation + Relation Lock Mode: AccessShareLock + Unprunable RTIs: 1 3 4 5 6 +(51 rows) ++======= + -- Property graph test + CREATE PROPERTY GRAPH vegetables_graph + VERTEX TABLES + ( + daucus KEY(name) DEFAULT LABEL LABEL vegetables, + brassica KEY(name) DEFAULT LABEL LABEL vegetables + ); + EXPLAIN (RANGE_TABLE, COSTS OFF) + SELECT * FROM GRAPH_TABLE (vegetables_graph MATCH (v1 IS vegetables) WHERE v1.genus = 'daucus' COLUMNS (v1.name)); + QUERY PLAN + ---------------------------------------------- + Append + Append RTIs: 1 + -> Seq Scan on daucus + Filter: (genus = 'daucus'::text) + Scan RTI: 4 + -> Seq Scan on brassica + Filter: (genus = 'daucus'::text) + Scan RTI: 5 + RTI 1 (subquery, inherited, in-from-clause): + Eref: "graph_table" (name) + Relation: vegetables_graph + Relation Kind: property_graph + Relation Lock Mode: AccessShareLock + Permission Info Index: 1 + Lateral: true + RTI 2 (subquery): + Eref: unnamed_subquery (name) + Lateral: true + RTI 3 (subquery): + Eref: unnamed_subquery (name) + Lateral: true + RTI 4 (relation): + Eref: daucus (id, name, genus) + Relation: daucus + Relation Kind: relation + Relation Lock Mode: AccessShareLock + Permission Info Index: 2 + RTI 5 (relation): + Eref: brassica (id, name, genus) + Relation: brassica + Relation Kind: relation + Relation Lock Mode: AccessShareLock + Permission Info Index: 3 + Unprunable RTIs: 1 4 5 + (34 rows) ++>>>>>>> theirs diff --cc contrib/pg_overexplain/sql/pg_overexplain.sql index 34a957cbed3,0eb18be76b6..00000000000 --- a/contrib/pg_overexplain/sql/pg_overexplain.sql +++ b/contrib/pg_overexplain/sql/pg_overexplain.sql @@@ -111,12 -111,13 +111,25 @@@ SELECT * FROM vegetables WHERE genus = EXPLAIN (RANGE_TABLE, COSTS OFF) INSERT INTO vegetables (name, genus) VALUES ('broccoflower', 'brassica'); ++<<<<<<< ours +-- should show "Subplan: sub" +EXPLAIN (RANGE_TABLE, COSTS OFF) +SELECT * FROM vegetables v, + (SELECT * FROM vegetables WHERE genus = 'daucus' OFFSET 0) sub; + +-- should show "Subplan: unnamed_subquery" +EXPLAIN (RANGE_TABLE, COSTS OFF) +SELECT * FROM vegetables v, + (SELECT * FROM vegetables WHERE genus = 'daucus' OFFSET 0); ++======= + -- Property graph test + CREATE PROPERTY GRAPH vegetables_graph + VERTEX TABLES + ( + daucus KEY(name) DEFAULT LABEL LABEL vegetables, + brassica KEY(name) DEFAULT LABEL LABEL vegetables + ); + + EXPLAIN (RANGE_TABLE, COSTS OFF) + SELECT * FROM GRAPH_TABLE (vegetables_graph MATCH (v1 IS vegetables) WHERE v1.genus = 'daucus' COLUMNS (v1.name)); ++>>>>>>> theirs