Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commita19e5ce

michaelpq

committed

Rename SetSingleFuncCall() to InitMaterializedSRF()

Per discussion, the existing routine name able to initialize a SRFfunction with materialize mode is unpopular, so rename it. Equally, theflags of this function are renamed, as of:- SRF_SINGLE_USE_EXPECTED -> MAT_SRF_USE_EXPECTED_DESC- SRF_SINGLE_BLESS -> MAT_SRF_BLESSThe previous function and flags introduced in9e98583 are kept aroundfor compatibility purposes, so as any extension code already compiledwith v15 continues to work as-is. The declarations introduced here forcompatibility will be removed from HEAD in a follow-up commit.The new names have been suggested by Andres Freund and MelaniePlageman.Discussion:https://postgr.es/m/20221013194820.ciktb2sbbpw7cljm@awork3.anarazel.deBackpatch-through: 15

1 parent77dd153 commita19e5ceCopy full SHA for a19e5ce

File tree

36 files changed

+72

-58

lines changed

contrib
- amcheck
  - verify_heapam.c
- dblink
  - dblink.c
- pageinspect
  - brinfuncs.c
  - gistfuncs.c
- pg_stat_statements
  - pg_stat_statements.c
- pg_walinspect
  - pg_walinspect.c
- pgrowlocks
  - pgrowlocks.c
- postgres_fdw
  - connection.c
- xml2
  - xpath.c
src
- backend
  - access/transam
    - rmgr.c
    - xlogprefetcher.c
  - commands
  - foreign
    - foreign.c
  - replication
    - logical
    - slotfuncs.c
    - walsender.c
  - storage/ipc
    - shmem.c
  - utils
    - adt
    - fmgr
      - README
      - funcapi.c
    - misc
      - guc_funcs.c
      - pg_config.c
    - mmgr
      - portalmem.c
- include
  - funcapi.h
- test/modules/test_ddl_deparse
  - test_ddl_deparse.c

36 files changed

+72

-58

lines changed

`‎contrib/amcheck/verify_heapam.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ verify_heapam(PG_FUNCTION_ARGS)`
`278`	`278`	`ctx.attnum=-1;`
`279`	`279`
`280`	`280`	`/* Construct the tuplestore and tuple descriptor */`
`281`		`-SetSingleFuncCall(fcinfo,0);`
	`281`	`+InitMaterializedSRF(fcinfo,0);`
`282`	`282`	`ctx.tupdesc=rsinfo->setDesc;`
`283`	`283`	`ctx.tupstore=rsinfo->setResult;`
`284`	`284`

`‎contrib/dblink/dblink.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1933,7 +1933,7 @@ dblink_get_notify(PG_FUNCTION_ARGS)`
`1933`	`1933`	`else`
`1934`	`1934`	`conn=pconn->conn;`
`1935`	`1935`
`1936`		`-SetSingleFuncCall(fcinfo,0);`
	`1936`	`+InitMaterializedSRF(fcinfo,0);`
`1937`	`1937`
`1938`	`1938`	`PQconsumeInput(conn);`
`1939`	`1939`	`while ((notify=PQnotifies(conn))!=NULL)`

`‎contrib/pageinspect/brinfuncs.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ brin_page_items(PG_FUNCTION_ARGS)`
`147`	`147`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`148`	`148`	`errmsg("must be superuser to use raw page functions")));`
`149`	`149`
`150`		`-SetSingleFuncCall(fcinfo,0);`
	`150`	`+InitMaterializedSRF(fcinfo,0);`
`151`	`151`
`152`	`152`	`indexRel=index_open(indexRelid,AccessShareLock);`
`153`	`153`

`‎contrib/pageinspect/gistfuncs.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ gist_page_items_bytea(PG_FUNCTION_ARGS)`
`127`	`127`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`128`	`128`	`errmsg("must be superuser to use raw page functions")));`
`129`	`129`
`130`		`-SetSingleFuncCall(fcinfo,0);`
	`130`	`+InitMaterializedSRF(fcinfo,0);`
`131`	`131`
`132`	`132`	`page=get_page_from_raw(raw_page);`
`133`	`133`
`@@ -211,7 +211,7 @@ gist_page_items(PG_FUNCTION_ARGS)`
`211`	`211`	`(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),`
`212`	`212`	`errmsg("must be superuser to use raw page functions")));`
`213`	`213`
`214`		`-SetSingleFuncCall(fcinfo,0);`
	`214`	`+InitMaterializedSRF(fcinfo,0);`
`215`	`215`
`216`	`216`	`/* Open the relation */`
`217`	`217`	`indexRel=index_open(indexRelid,AccessShareLock);`

`‎contrib/pg_stat_statements/pg_stat_statements.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1552,7 +1552,7 @@ pg_stat_statements_internal(FunctionCallInfo fcinfo,`
`1552`	`1552`	`(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),`
`1553`	`1553`	`errmsg("pg_stat_statements must be loaded via shared_preload_libraries")));`
`1554`	`1554`
`1555`		`-SetSingleFuncCall(fcinfo,0);`
	`1555`	`+InitMaterializedSRF(fcinfo,0);`
`1556`	`1556`
`1557`	`1557`	`/*`
`1558`	`1558`	`* Check we have the expected number of output arguments. Aside from`

`‎contrib/pg_walinspect/pg_walinspect.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ GetWALRecordsInfo(FunctionCallInfo fcinfo, XLogRecPtr start_lsn,`
`330`	`330`	`Datumvalues[PG_GET_WAL_RECORDS_INFO_COLS]= {0};`
`331`	`331`	`boolnulls[PG_GET_WAL_RECORDS_INFO_COLS]= {0};`
`332`	`332`
`333`		`-SetSingleFuncCall(fcinfo,0);`
	`333`	`+InitMaterializedSRF(fcinfo,0);`
`334`	`334`
`335`	`335`	`xlogreader=InitXLogReaderState(start_lsn);`
`336`	`336`
`@@ -548,7 +548,7 @@ GetWalStats(FunctionCallInfo fcinfo, XLogRecPtr start_lsn,`
`548`	`548`	`Datumvalues[PG_GET_WAL_STATS_COLS]= {0};`
`549`	`549`	`boolnulls[PG_GET_WAL_STATS_COLS]= {0};`
`550`	`550`
`551`		`-SetSingleFuncCall(fcinfo,0);`
	`551`	`+InitMaterializedSRF(fcinfo,0);`
`552`	`552`
`553`	`553`	`xlogreader=InitXLogReaderState(start_lsn);`
`554`	`554`

`‎contrib/pgrowlocks/pgrowlocks.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ pgrowlocks(PG_FUNCTION_ARGS)`
`75`	`75`	`AclResultaclresult;`
`76`	`76`	`char**values;`
`77`	`77`
`78`		`-SetSingleFuncCall(fcinfo,0);`
	`78`	`+InitMaterializedSRF(fcinfo,0);`
`79`	`79`
`80`	`80`	`/* Access the table */`
`81`	`81`	`relrv=makeRangeVarFromNameList(textToQualifiedNameList(relname));`

`‎contrib/postgres_fdw/connection.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1668,7 +1668,7 @@ postgres_fdw_get_connections(PG_FUNCTION_ARGS)`
`1668`	`1668`	`HASH_SEQ_STATUSscan;`
`1669`	`1669`	`ConnCacheEntry*entry;`
`1670`	`1670`
`1671`		`-SetSingleFuncCall(fcinfo,0);`
	`1671`	`+InitMaterializedSRF(fcinfo,0);`
`1672`	`1672`
`1673`	`1673`	`/* If cache doesn't exist, we return no records */`
`1674`	`1674`	`if (!ConnectionHash)`

`‎contrib/xml2/xpath.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -511,7 +511,7 @@ xpath_table(PG_FUNCTION_ARGS)`
`511`	`511`	`PgXmlErrorContext*xmlerrcxt;`
`512`	`512`	`volatilexmlDocPtrdoctree=NULL;`
`513`	`513`
`514`		`-SetSingleFuncCall(fcinfo,SRF_SINGLE_USE_EXPECTED);`
	`514`	`+InitMaterializedSRF(fcinfo,MAT_SRF_USE_EXPECTED_DESC);`
`515`	`515`
`516`	`516`	`/* must have at least one output column (for the pkey) */`
`517`	`517`	`if (rsinfo->setDesc->natts<1)`

`‎src/backend/access/transam/rmgr.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ pg_get_wal_resource_managers(PG_FUNCTION_ARGS)`
`145`	`145`	`Datumvalues[PG_GET_RESOURCE_MANAGERS_COLS];`
`146`	`146`	`boolnulls[PG_GET_RESOURCE_MANAGERS_COLS]= {0};`
`147`	`147`
`148`		`-SetSingleFuncCall(fcinfo,0);`
	`148`	`+InitMaterializedSRF(fcinfo,0);`
`149`	`149`
`150`	`150`	`for (intrmid=0;rmid <=RM_MAX_ID;rmid++)`
`151`	`151`	`{`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp