Movatterモバイル変換

Skip to content

postgrespro/postgresPublic

forked frompostgres/postgres

NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6a04d34

anarazel

committed

Don't include utils/array.h from acl.h.

For most uses of acl.h the details of how "Acl" internally looks likeare irrelevant. It might make sense to move a lot of theimplementation details into a separate header at a later point.The main motivation of this change is to avoid including fmgr.h (viaarray.h, which needs it for exposed structs) in a lot of files thatotherwise don't need it. A subsequent commit will remove the fmgr.hinclude from a lot of files.Directly include utils/array.h and utils/expandeddatum.h from thefiles that need them, but previously included them indirectly, viaacl.h.Author: Andres FreundDiscussion:https://postgr.es/m/20190803193733.g3l3x3o42uv4qj7l@alap3.anarazel.de

1 parent0ae2dc4 commit6a04d34Copy full SHA for 6a04d34

File tree

14 files changed

+14

-4

lines changed

contrib/pageinspect
- hashfuncs.c
src
- backend
  - executor
  - partitioning
    - partprune.c
  - statistics
    - extended_stats.c
    - mcv.c
  - utils/adt
    - acl.c
    - tsvector_op.c
- include
  - catalog
    - objectaddress.h
  - utils
    - acl.h
    - array.h

14 files changed

+14

-4

lines changed

`‎contrib/pageinspect/hashfuncs.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`	`#include"catalog/pg_am.h"`
`19`	`19`	`#include"funcapi.h"`
`20`	`20`	`#include"miscadmin.h"`
	`21`	`+#include"utils/array.h"`
`21`	`22`	`#include"utils/builtins.h"`
`22`	`23`	`#include"utils/rel.h"`
`23`	`24`

`‎src/backend/executor/execExpr.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`	`#include"nodes/nodeFuncs.h"`
`43`	`43`	`#include"optimizer/optimizer.h"`
`44`	`44`	`#include"pgstat.h"`
	`45`	`+#include"utils/array.h"`
`45`	`46`	`#include"utils/builtins.h"`
`46`	`47`	`#include"utils/datum.h"`
`47`	`48`	`#include"utils/lsyscache.h"`

`‎src/backend/executor/execExprInterp.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@`
`62`	`62`	`#include"executor/execExpr.h"`
`63`	`63`	`#include"executor/nodeSubplan.h"`
`64`	`64`	`#include"funcapi.h"`
	`65`	`+#include"utils/array.h"`
`65`	`66`	`#include"utils/memutils.h"`
`66`	`67`	`#include"miscadmin.h"`
`67`	`68`	`#include"nodes/nodeFuncs.h"`

`‎src/backend/executor/execTuples.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@`
`65`	`65`	`#include"nodes/nodeFuncs.h"`
`66`	`66`	`#include"storage/bufmgr.h"`
`67`	`67`	`#include"utils/builtins.h"`
	`68`	`+#include"utils/expandeddatum.h"`
`68`	`69`	`#include"utils/lsyscache.h"`
`69`	`70`	`#include"utils/typcache.h"`
`70`	`71`

`‎src/backend/executor/nodeAgg.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@`
`231`	`231`	`#include"parser/parse_coerce.h"`
`232`	`232`	`#include"utils/acl.h"`
`233`	`233`	`#include"utils/builtins.h"`
	`234`	`+#include"utils/expandeddatum.h"`
`234`	`235`	`#include"utils/lsyscache.h"`
`235`	`236`	`#include"utils/memutils.h"`
`236`	`237`	`#include"utils/syscache.h"`

`‎src/backend/executor/nodeWindowAgg.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@`
`46`	`46`	`#include"parser/parse_coerce.h"`
`47`	`47`	`#include"utils/acl.h"`
`48`	`48`	`#include"utils/builtins.h"`
	`49`	`+#include"utils/expandeddatum.h"`
`49`	`50`	`#include"utils/datum.h"`
`50`	`51`	`#include"utils/lsyscache.h"`
`51`	`52`	`#include"utils/memutils.h"`

`‎src/backend/partitioning/partprune.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@`
`53`	`53`	`#include"partitioning/partbounds.h"`
`54`	`54`	`#include"partitioning/partprune.h"`
`55`	`55`	`#include"rewrite/rewriteManip.h"`
	`56`	`+#include"utils/array.h"`
`56`	`57`	`#include"utils/lsyscache.h"`
`57`	`58`
`58`	`59`

`‎src/backend/statistics/extended_stats.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`#include"postmaster/autovacuum.h"`
`32`	`32`	`#include"statistics/extended_stats_internal.h"`
`33`	`33`	`#include"statistics/statistics.h"`
	`34`	`+#include"utils/array.h"`
`34`	`35`	`#include"utils/builtins.h"`
`35`	`36`	`#include"utils/fmgroids.h"`
`36`	`37`	`#include"utils/lsyscache.h"`

`‎src/backend/statistics/mcv.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@`
`26`	`26`	`#include"optimizer/clauses.h"`
`27`	`27`	`#include"statistics/extended_stats_internal.h"`
`28`	`28`	`#include"statistics/statistics.h"`
	`29`	`+#include"utils/array.h"`
`29`	`30`	`#include"utils/builtins.h"`
`30`	`31`	`#include"utils/bytea.h"`
`31`	`32`	`#include"utils/fmgroids.h"`

`‎src/backend/utils/adt/acl.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@`
`30`	`30`	`#include"funcapi.h"`
`31`	`31`	`#include"miscadmin.h"`
`32`	`32`	`#include"utils/acl.h"`
	`33`	`+#include"utils/array.h"`
`33`	`34`	`#include"utils/builtins.h"`
`34`	`35`	`#include"utils/catcache.h"`
`35`	`36`	`#include"utils/hashutils.h"`

`‎src/backend/utils/adt/tsvector_op.c`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include"miscadmin.h"`
`26`	`26`	`#include"parser/parse_coerce.h"`
`27`	`27`	`#include"tsearch/ts_utils.h"`
	`28`	`+#include"utils/array.h"`
`28`	`29`	`#include"utils/builtins.h"`
`29`	`30`	`#include"utils/lsyscache.h"`
`30`	`31`	`#include"utils/regproc.h"`

`‎src/include/catalog/objectaddress.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ extern char getObjectTypeDescription(const ObjectAddress object);`
`77`	`77`	`externchargetObjectIdentity(constObjectAddressaddress);`
`78`	`78`	`externchargetObjectIdentityParts(constObjectAddressaddress,`
`79`	`79`	`Listobjname,Listobjargs);`
`80`		`-externArrayTypestrlist_to_textarray(Listlist);`
	`80`	`+externstructArrayTypestrlist_to_textarray(Listlist);`
`81`	`81`
`82`	`82`	`externObjectTypeget_relkind_objtype(charrelkind);`
`83`	`83`

`‎src/include/utils/acl.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@`
`35`	`35`	`#include"access/htup.h"`
`36`	`36`	`#include"nodes/parsenodes.h"`
`37`	`37`	`#include"parser/parse_node.h"`
`38`		`-#include"utils/array.h"`
`39`	`38`	`#include"utils/snapshot.h"`
`40`	`39`
`41`	`40`
`@@ -104,7 +103,7 @@ typedef struct AclItem`
`104`	`103`	`/*`
`105`	`104`	`* Acla one-dimensional array of AclItem`
`106`	`105`	`*/`
`107`		`-typedefArrayTypeAcl;`
	`106`	`+typedefstructArrayTypeAcl;`
`108`	`107`
`109`	`108`	`#defineACL_NUM(ACL)(ARR_DIMS(ACL)[0])`
`110`	`109`	`#defineACL_DAT(ACL)((AclItem *) ARR_DATA_PTR(ACL))`

`‎src/include/utils/array.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ struct ExprContext;`
`77`	`77`	`* CAUTION: if you change the header for ordinary arrays you will also`
`78`	`78`	`* need to change the headers for oidvector and int2vector!`
`79`	`79`	`*/`
`80`		`-typedefstruct`
	`80`	`+typedefstructArrayType`
`81`	`81`	`{`
`82`	`82`	`int32vl_len_;/* varlena header (do not touch directly!) */`
`83`	`83`	`intndim;/* # of dimensions */`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp