NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit7e73503

Amit Kapila

committed

Make the order of the header file includes consistent in contrib modules.

The basic rule we follow here is to always first include 'postgres.h' or'postgres_fe.h' whichever is applicable, then system header includes andthen Postgres header includes. In this, we also follow that all thePostgres header includes are in order based on their ASCII value. Wegenerally follow these rules, but the code has deviated in many places.This commit makes it consistent just for contrib modules. The latercommits will enforce similar rules in other parts of code.Author: Vignesh CReviewed-by: Amit KapilaDiscussion:https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

1 parent59c2617 commit7e73503Copy full SHA for 7e73503

File tree

85 files changed

+115

-183

lines changed

contrib
- bloom
  - blcost.c
  - blinsert.c
  - blscan.c
  - blutils.c
  - blvalidate.c
- btree_gin
  - btree_gin.c
- btree_gist
  - btree_enum.c
  - btree_inet.c
  - btree_numeric.c
  - btree_utils_var.c
- cube
  - cube.c
- dblink
  - dblink.c
- hstore_plpython
  - hstore_plpython.c
- hstore
  - hstore_gist.c
  - hstore_io.c
  - hstore_op.c
- intarray
  - _int_bool.c
  - _int_gin.c
  - _int_gist.c
  - _int_op.c
  - _int_selfuncs.c
  - _int_tool.c
  - _intbig_gist.c
- isn
  - isn.c
- jsonb_plperl
  - jsonb_plperl.c
- jsonb_plpython
  - jsonb_plpython.c
- ltree_plpython
  - ltree_plpython.c
- ltree
  - _ltree_gist.c
  - crc32.c
  - lquery_op.c
  - ltree_io.c
  - ltree_op.c
- oid2name
  - oid2name.c
- pageinspect
  - brinfuncs.c
  - btreefuncs.c
  - fsmfuncs.c
  - ginfuncs.c
  - hashfuncs.c
  - heapfuncs.c
  - rawpage.c
- passwordcheck
  - passwordcheck.c
- pg_standby
  - pg_standby.c
- pg_trgm
  - trgm_gin.c
  - trgm_gist.c
  - trgm_op.c
  - trgm_regexp.c
- pgcrypto
  - crypt-md5.c
  - internal.c
  - mbuf.c
  - openssl.c
  - pgcrypto.c
  - pgp-armor.c
  - pgp-cfb.c
  - pgp-compress.c
  - pgp-decrypt.c
  - pgp-encrypt.c
  - pgp-info.c
  - pgp-mpi-internal.c
  - pgp-mpi-openssl.c
  - pgp-mpi.c
  - pgp-pgsql.c
  - pgp-pubdec.c
  - pgp-pubenc.c
  - pgp-pubkey.c
  - pgp-s2k.c
  - pgp.c
  - px-crypt.c
- pgstattuple
  - pgstatapprox.c
- postgres_fdw
  - connection.c
  - deparse.c
  - option.c
  - postgres_fdw.c
  - shippable.c
- sepgsql
  - database.c
  - dml.c
  - hooks.c
  - label.c
  - proc.c
  - relation.c
  - schema.c
  - uavc.c
- spi
  - moddatetime.c
- tablefunc
  - tablefunc.c
- tcn
  - tcn.c
- vacuumlo
  - vacuumlo.c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+115

-183

lines changed

`‎contrib/bloom/blcost.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@`
`12`	`12`	`*/`
`13`	`13`	`#include"postgres.h"`
`14`	`14`
	`15`	`+#include"bloom.h"`
`15`	`16`	`#include"fmgr.h"`
`16`	`17`	`#include"utils/selfuncs.h"`
`17`	`18`
`18`		`-#include"bloom.h"`
`19`		`-`
`20`	`19`	`/*`
`21`	`20`	`* Estimate cost of bloom index scan.`
`22`	`21`	`*/`

`‎contrib/bloom/blinsert.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include"access/genam.h"`
`16`	`16`	`#include"access/generic_xlog.h"`
`17`	`17`	`#include"access/tableam.h"`
	`18`	`+#include"bloom.h"`
`18`	`19`	`#include"catalog/index.h"`
`19`	`20`	`#include"miscadmin.h"`
`20`	`21`	`#include"storage/bufmgr.h"`
`@@ -23,8 +24,6 @@`
`23`	`24`	`#include"utils/memutils.h"`
`24`	`25`	`#include"utils/rel.h"`
`25`	`26`
`26`		`-#include"bloom.h"`
`27`		`-`
`28`	`27`	`PG_MODULE_MAGIC;`
`29`	`28`
`30`	`29`	`/*`

`‎contrib/bloom/blscan.c‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,14 @@`
`13`	`13`	`#include"postgres.h"`
`14`	`14`
`15`	`15`	`#include"access/relscan.h"`
`16`		`-#include"pgstat.h"`
	`16`	`+#include"bloom.h"`
`17`	`17`	`#include"miscadmin.h"`
	`18`	`+#include"pgstat.h"`
`18`	`19`	`#include"storage/bufmgr.h"`
`19`	`20`	`#include"storage/lmgr.h"`
`20`	`21`	`#include"utils/memutils.h"`
`21`	`22`	`#include"utils/rel.h"`
`22`	`23`
`23`		`-#include"bloom.h"`
`24`		`-`
`25`	`24`	`/*`
`26`	`25`	`* Begin scan of bloom index.`
`27`	`26`	`*/`

`‎contrib/bloom/blutils.c‎`

Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,17 +15,15 @@`
`15`	`15`
`16`	`16`	`#include"access/amapi.h"`
`17`	`17`	`#include"access/generic_xlog.h"`
	`18`	`+#include"access/reloptions.h"`
	`19`	`+#include"bloom.h"`
`18`	`20`	`#include"catalog/index.h"`
`19`		`-#include"storage/lmgr.h"`
`20`	`21`	`#include"miscadmin.h"`
`21`	`22`	`#include"storage/bufmgr.h"`
`22`		`-#include"storage/indexfsm.h"`
`23`		`-#include"utils/memutils.h"`
`24`		`-#include"access/reloptions.h"`
`25`	`23`	`#include"storage/freespace.h"`
`26`	`24`	`#include"storage/indexfsm.h"`
`27`		`-`
`28`		`-#include"bloom.h"`
	`25`	`+#include"storage/lmgr.h"`
	`26`	`+#include"utils/memutils.h"`
`29`	`27`
`30`	`28`	`/* Signature dealing macros - note i is assumed to be of type int */`
`31`	`29`	`#defineGETWORD(x,i) ( ( (BloomSignatureWord )(x) + ( (i) / SIGNWORDBITS ) ) )`

`‎contrib/bloom/blvalidate.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`#include"access/amvalidate.h"`
`16`	`16`	`#include"access/htup_details.h"`
	`17`	`+#include"bloom.h"`
`17`	`18`	`#include"catalog/pg_amop.h"`
`18`	`19`	`#include"catalog/pg_amproc.h"`
`19`	`20`	`#include"catalog/pg_opclass.h"`
`@@ -24,8 +25,6 @@`
`24`	`25`	`#include"utils/regproc.h"`
`25`	`26`	`#include"utils/syscache.h"`
`26`	`27`
`27`		`-#include"bloom.h"`
`28`		`-`
`29`	`28`	`/*`
`30`	`29`	`* Validator for a bloom opclass.`
`31`	`30`	`*/`

`‎contrib/btree_gin/btree_gin.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`#include"utils/inet.h"`
`15`	`15`	`#include"utils/numeric.h"`
`16`	`16`	`#include"utils/timestamp.h"`
`17`		`-#include"utils/varbit.h"`
`18`	`17`	`#include"utils/uuid.h"`
	`18`	`+#include"utils/varbit.h"`
`19`	`19`
`20`	`20`	`PG_MODULE_MAGIC;`
`21`	`21`

`‎contrib/btree_gist/btree_enum.c‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,11 +2,11 @@`
`2`	`2`	`* contrib/btree_gist/btree_enum.c`
`3`	`3`	`*/`
`4`	`4`	`#include"postgres.h"`
`5`		`-#include"fmgr.h"`
`6`		`-#include"utils/builtins.h"`
`7`	`5`
`8`	`6`	`#include"btree_gist.h"`
`9`	`7`	`#include"btree_utils_num.h"`
	`8`	`+#include"fmgr.h"`
	`9`	`+#include"utils/builtins.h"`
`10`	`10`
`11`	`11`	`/* enums are really Oids, so we just use the same structure */`
`12`	`12`

`‎contrib/btree_gist/btree_inet.c‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`#include"btree_gist.h"`
`7`	`7`	`#include"btree_utils_num.h"`
	`8`	`+#include"catalog/pg_type.h"`
`8`	`9`	`#include"utils/builtins.h"`
`9`	`10`	`#include"utils/inet.h"`
`10`		`-#include"catalog/pg_type.h"`
`11`	`11`
`12`	`12`	`typedefstructinetkey`
`13`	`13`	`{`

`‎contrib/btree_gist/btree_numeric.c‎`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,10 @@`
`3`	`3`	`*/`
`4`	`4`	`#include"postgres.h"`
`5`	`5`
`6`		`-#include"btree_gist.h"`
`7`		`-`
`8`	`6`	`#include<math.h>`
`9`	`7`	`#include<float.h>`
`10`	`8`
	`9`	`+#include"btree_gist.h"`
`11`	`10`	`#include"btree_utils_var.h"`
`12`	`11`	`#include"utils/builtins.h"`
`13`	`12`	`#include"utils/numeric.h"`

`‎contrib/btree_gist/btree_utils_var.c‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,15 +3,14 @@`
`3`	`3`	`*/`
`4`	`4`	`#include"postgres.h"`
`5`	`5`
`6`		`-#include"btree_gist.h"`
`7`		`-`
`8`	`6`	`#include<math.h>`
`9`	`7`	`#include<limits.h>`
`10`	`8`	`#include<float.h>`
`11`	`9`
	`10`	`+#include"btree_gist.h"`
`12`	`11`	`#include"btree_utils_var.h"`
`13`		`-#include"utils/pg_locale.h"`
`14`	`12`	`#include"utils/builtins.h"`
	`13`	`+#include"utils/pg_locale.h"`
`15`	`14`	`#include"utils/rel.h"`
`16`	`15`
`17`	`16`	`/* used for key sorting */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7e73503

File tree

85 files changed

Some content is hidden

85 files changed

`‎contrib/bloom/blcost.c‎`

`‎contrib/bloom/blinsert.c‎`

`‎contrib/bloom/blscan.c‎`

`‎contrib/bloom/blutils.c‎`

`‎contrib/bloom/blvalidate.c‎`

`‎contrib/btree_gin/btree_gin.c‎`

`‎contrib/btree_gist/btree_enum.c‎`

`‎contrib/btree_gist/btree_inet.c‎`

`‎contrib/btree_gist/btree_numeric.c‎`

`‎contrib/btree_gist/btree_utils_var.c‎`

0 commit comments