=== Applying patches on top of PostgreSQL commit ID 1aa7cf9eb85972aaf2969306e84f5fc794fbef7f === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Apr 27 22:47:27 UTC 2025 On branch cf/5318 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Add-infrastructure-for-pg_system_versions-view.patch === Applying: Add infrastructure for pg_system_versions view Using index info to reconstruct a base tree... M doc/src/sgml/system-views.sgml M src/backend/catalog/system_views.sql M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out 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/expected/rules.out Auto-merging src/include/catalog/pg_proc.dat CONFLICT (content): Merge conflict in src/include/catalog/pg_proc.dat Auto-merging src/backend/catalog/system_views.sql CONFLICT (content): Merge conflict in src/backend/catalog/system_views.sql Auto-merging doc/src/sgml/system-views.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 Add infrastructure for pg_system_versions view 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/system-views.sgml M src/backend/catalog/system_views.sql M src/backend/utils/misc/Makefile M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Removing src/backend/utils/misc/system_version.c Removing src/include/utils/system_version.h === using patch(1) to apply patch ./v3-0001-Add-infrastructure-for-pg_system_versions-view.patch === patching file doc/src/sgml/system-views.sgml Hunk #1 succeeded at 236 (offset 10 lines). Hunk #2 succeeded at 5479 (offset 406 lines). patching file src/backend/catalog/system_views.sql Hunk #1 FAILED at 1388. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/catalog/system_views.sql.rej patching file src/backend/utils/misc/Makefile patching file src/backend/utils/misc/meson.build patching file src/backend/utils/misc/system_version.c patching file src/include/catalog/pg_proc.dat Hunk #1 succeeded at 12566 with fuzz 2 (offset 128 lines). patching file src/include/utils/system_version.h patching file src/test/regress/expected/rules.out Hunk #1 succeeded at 2649 (offset 32 lines). patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 2908 (offset 85 lines). Hunk #2 succeeded at 4160 (offset 95 lines). Unstaged changes after reset: M doc/src/sgml/system-views.sgml M src/backend/utils/misc/Makefile M src/backend/utils/misc/meson.build M src/include/catalog/pg_proc.dat M src/test/regress/expected/rules.out M src/tools/pgindent/typedefs.list Removing src/backend/catalog/system_views.sql.rej Removing src/backend/utils/misc/system_version.c Removing src/include/utils/system_version.h === using 'git apply' to apply patch ./v3-0001-Add-infrastructure-for-pg_system_versions-view.patch === Applied patch to 'doc/src/sgml/system-views.sgml' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' with conflicts. Applied patch to 'src/backend/utils/misc/Makefile' cleanly. Applied patch to 'src/backend/utils/misc/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/include/catalog/pg_proc.dat' with conflicts. 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/catalog/system_views.sql U src/include/catalog/pg_proc.dat diff --cc src/backend/catalog/system_views.sql index 15efb02badb,0704567bf8c..00000000000 --- a/src/backend/catalog/system_views.sql +++ b/src/backend/catalog/system_views.sql @@@ -1406,9 -1389,10 +1406,19 @@@ CREATE VIEW pg_stat_subscription_stats CREATE VIEW pg_wait_events AS SELECT * FROM pg_get_wait_events(); ++<<<<<<< ours +CREATE VIEW pg_aios AS + SELECT * FROM pg_get_aios(); +REVOKE ALL ON pg_aios FROM PUBLIC; +GRANT SELECT ON pg_aios TO pg_read_all_stats; +REVOKE EXECUTE ON FUNCTION pg_get_aios() FROM PUBLIC; +GRANT EXECUTE ON FUNCTION pg_get_aios() TO pg_read_all_stats; ++======= + CREATE VIEW pg_system_versions AS + SELECT + name, version, + CASE type WHEN 0 THEN 'Compile Time' + WHEN 1 THEN 'Run Time' + END AS "type" + FROM pg_get_system_versions(); ++>>>>>>> theirs diff --cc src/include/catalog/pg_proc.dat index 62beb71da28,563c2bc1437..00000000000 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@@ -12557,13 -12438,10 +12557,22 @@@ proargtypes => 'int4', prosrc => 'gist_stratnum_common' }, ++<<<<<<< ours +# AIO related functions +{ oid => '9200', descr => 'information about in-progress asynchronous IOs', + proname => 'pg_get_aios', prorows => '100', proretset => 't', + provolatile => 'v', proparallel => 'r', prorettype => 'record', proargtypes => '', + proallargtypes => '{int4,int4,int8,text,text,int8,int8,text,int2,int4,text,text,bool,bool,bool}', + proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}', + proargnames => '{pid,io_id,io_generation,state,operation,off,length,target,handle_data_len,raw_result,result,target_desc,f_sync,f_localmem,f_buffered}', + prosrc => 'pg_get_aios' }, + ++======= + { oid => '9432', descr => 'describe system verions', + proname => 'pg_get_system_versions', procost => '10', prorows => '10', + proretset => 't', provolatile => 'v', prorettype => 'record', + proargtypes => '', proallargtypes => '{text,text,int8}', + proargmodes => '{o,o,o}', proargnames => '{name,version,type}', + prosrc => 'pg_get_system_versions' }, ++>>>>>>> theirs ]