NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commite048722

Amit Kapila

committed

Make the order of the header file includes consistent.

Similar to commits14aec03,7e73503 anddddf4cd, this commitmakes the order of header file inclusion consistent in more places.Author: Vignesh CReviewed-by: Amit KapilaDiscussion:https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com

1 parent2aa8452 commite048722Copy full SHA for e048722

File tree

78 files changed

+125

-208

lines changed

contrib
- bloom
  - bloom.h
- btree_gist
- postgres_fdw
  - postgres_fdw.h
src
- backend/libpq
  - auth.c
- bin
  - pg_basebackup
    - receivelog.h
    - streamutil.h
  - pg_dump
    - pg_backup_archiver.h
  - pg_rewind
  - pg_waldump
    - pg_waldump.c
  - psql
  - scripts
    - common.h
- include
  - access
  - catalog
  - commands
    - event_trigger.h
  - executor
  - funcapi.h
  - jit
    - llvmjit.h
  - nodes
    - execnodes.h
  - replication
  - rewrite
    - rewriteHandler.h
  - statistics
    - extended_stats_internal.h
  - storage
  - tsearch
    - ts_locale.h
  - utils
- interfaces/ecpg
  - ecpglib
  - include
    - ecpglib.h
  - preproc
    - preproc_extern.h
- pl
  - plperl
    - plperl.c
  - plpython
- test/modules/test_ginpostinglist
  - test_ginpostinglist.c

Some content is hidden

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

78 files changed

+125

-208

lines changed

`‎contrib/bloom/bloom.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`#include"access/generic_xlog.h"`
`18`	`18`	`#include"access/itup.h"`
`19`	`19`	`#include"access/xlog.h"`
`20`		`-#include"nodes/pathnodes.h"`
`21`	`20`	`#include"fmgr.h"`
	`21`	`+#include"nodes/pathnodes.h"`
`22`	`22`
`23`	`23`	`/* Support procedures numbers */`
`24`	`24`	`#defineBLOOM_HASH_PROC1`

`‎contrib/btree_gist/btree_gist.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`#ifndef__BTREE_GIST_H__`
`5`	`5`	`#define__BTREE_GIST_H__`
`6`	`6`
`7`		`-#include"fmgr.h"`
`8`	`7`	`#include"access/nbtree.h"`
	`8`	`+#include"fmgr.h"`
`9`	`9`
`10`	`10`	`#defineBtreeGistNotEqualStrategyNumber 6`
`11`	`11`

`‎contrib/btree_gist/btree_utils_num.h`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,13 +4,13 @@`
`4`	`4`	`#ifndef__BTREE_UTILS_NUM_H__`
`5`	`5`	`#define__BTREE_UTILS_NUM_H__`
`6`	`6`
`7`		`-#include"btree_gist.h"`
`8`		`-#include"access/gist.h"`
`9`		`-#include"utils/rel.h"`
`10`		`-`
`11`	`7`	`#include<math.h>`
`12`	`8`	`#include<float.h>`
`13`	`9`
	`10`	`+#include"access/gist.h"`
	`11`	`+#include"btree_gist.h"`
	`12`	`+#include"utils/rel.h"`
	`13`	`+`
`14`	`14`	`typedefcharGBT_NUMKEY;`
`15`	`15`
`16`	`16`	`/* Better readable key */`

`‎contrib/btree_gist/btree_utils_var.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,8 @@`
`4`	`4`	`#ifndef__BTREE_UTILS_VAR_H__`
`5`	`5`	`#define__BTREE_UTILS_VAR_H__`
`6`	`6`
`7`		`-#include"btree_gist.h"`
`8`		`-`
`9`	`7`	`#include"access/gist.h"`
	`8`	`+#include"btree_gist.h"`
`10`	`9`	`#include"mb/pg_wchar.h"`
`11`	`10`
`12`	`11`	`/* Variable length key */`

`‎contrib/postgres_fdw/postgres_fdw.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,10 @@`
`15`	`15`
`16`	`16`	`#include"foreign/foreign.h"`
`17`	`17`	`#include"lib/stringinfo.h"`
	`18`	`+#include"libpq-fe.h"`
`18`	`19`	`#include"nodes/pathnodes.h"`
`19`	`20`	`#include"utils/relcache.h"`
`20`	`21`
`21`		`-#include"libpq-fe.h"`
`22`		`-`
`23`	`22`	`/*`
`24`	`23`	`* FDW-specific planner information kept in RelOptInfo.fdw_private for a`
`25`	`24`	`* postgres_fdw foreign table. For a baserel, this struct is created by`

`‎src/backend/libpq/auth.c`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@`
`39`	`39`	`#include"utils/memutils.h"`
`40`	`40`	`#include"utils/timestamp.h"`
`41`	`41`
`42`		`-`
`43`	`42`	`/*----------------------------------------------------------------`
`44`	`43`	`* Global authentication functions`
`45`	`44`	`*----------------------------------------------------------------`

`‎src/bin/pg_basebackup/receivelog.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@`
`12`	`12`	`#ifndefRECEIVELOG_H`
`13`	`13`	`#defineRECEIVELOG_H`
`14`	`14`
	`15`	`+#include"access/xlogdefs.h"`
`15`	`16`	`#include"libpq-fe.h"`
`16`	`17`	`#include"walmethods.h"`
`17`	`18`
`18`		`-#include"access/xlogdefs.h"`
`19`		`-`
`20`	`19`	`/*`
`21`	`20`	`* Called before trying to read more data or when a segment is`
`22`	`21`	`* finished. Return true to stop streaming.`

`‎src/bin/pg_basebackup/streamutil.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,10 +12,9 @@`
`12`	`12`	`#ifndefSTREAMUTIL_H`
`13`	`13`	`#defineSTREAMUTIL_H`
`14`	`14`
`15`		`-#include"libpq-fe.h"`
`16`		`-`
`17`	`15`	`#include"access/xlogdefs.h"`
`18`	`16`	`#include"datatype/timestamp.h"`
	`17`	`+#include"libpq-fe.h"`
`19`	`18`
`20`	`19`	`externconstchar*progname;`
`21`	`20`	`externchar*connection_string;`

`‎src/bin/pg_dump/pg_backup_archiver.h`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,10 @@`
`24`	`24`	`#ifndef__PG_BACKUP_ARCHIVE__`
`25`	`25`	`#define__PG_BACKUP_ARCHIVE__`
`26`	`26`
`27`		`-`
`28`	`27`	`#include<time.h>`
`29`	`28`
`30`		`-#include"pg_backup.h"`
`31`		`-`
`32`	`29`	`#include"libpq-fe.h"`
	`30`	`+#include"pg_backup.h"`
`33`	`31`	`#include"pqexpbuffer.h"`
`34`	`32`
`35`	`33`	`#defineLOBBUFSIZE 16384`

`‎src/bin/pg_rewind/datapagemap.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,8 @@`
`9`	`9`	`#ifndefDATAPAGEMAP_H`
`10`	`10`	`#defineDATAPAGEMAP_H`
`11`	`11`
`12`		`-#include"storage/relfilenode.h"`
`13`	`12`	`#include"storage/block.h"`
`14`		`-`
	`13`	`+#include"storage/relfilenode.h"`
`15`	`14`
`16`	`15`	`structdatapagemap`
`17`	`16`	`{`

`‎src/bin/pg_rewind/filemap.h`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,9 @@`
`8`	`8`	`#ifndefFILEMAP_H`
`9`	`9`	`#defineFILEMAP_H`
`10`	`10`
`11`		`-#include"storage/relfilenode.h"`
`12`		`-#include"storage/block.h"`
`13`		`-`
`14`	`11`	`#include"datapagemap.h"`
	`12`	`+#include"storage/block.h"`
	`13`	`+#include"storage/relfilenode.h"`
`15`	`14`
`16`	`15`	`/*`
`17`	`16`	`* For every file found in the local or remote system, we have a file entry`

`‎src/bin/pg_rewind/pg_rewind.h`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,13 @@`
`11`	`11`	`#ifndefPG_REWIND_H`
`12`	`12`	`#definePG_REWIND_H`
`13`	`13`
`14`		`-#include"datapagemap.h"`
`15`		`-`
`16`	`14`	`#include"access/timeline.h"`
`17`	`15`	`#include"common/logging.h"`
	`16`	`+#include"datapagemap.h"`
`18`	`17`	`#include"libpq-fe.h"`
`19`	`18`	`#include"storage/block.h"`
`20`	`19`	`#include"storage/relfilenode.h"`
`21`	`20`
`22`		`-`
`23`	`21`	`/* Configuration options */`
`24`	`22`	`externchar*datadir_target;`
`25`	`23`	`externchar*datadir_source;`

`‎src/bin/pg_waldump/pg_waldump.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@`
`16`	`16`	`#include<sys/stat.h>`
`17`	`17`	`#include<unistd.h>`
`18`	`18`
	`19`	`+#include"access/transam.h"`
`19`	`20`	`#include"access/xlog_internal.h"`
`20`	`21`	`#include"access/xlogreader.h"`
`21`	`22`	`#include"access/xlogrecord.h"`
`22`		`-#include"access/transam.h"`
`23`	`23`	`#include"common/fe_memutils.h"`
`24`	`24`	`#include"common/logging.h"`
`25`	`25`	`#include"getopt_long.h"`

`‎src/bin/psql/command.c`

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`* src/bin/psql/command.c`
`7`	`7`	`*/`
`8`	`8`	`#include"postgres_fe.h"`
`9`		`-#include"command.h"`
`10`	`9`
`11`	`10`	`#include<ctype.h>`
`12`	`11`	`#include<time.h>`
`@@ -24,22 +23,21 @@`
`24`	`23`	`#endif`
`25`	`24`
`26`	`25`	`#include"catalog/pg_class_d.h"`
`27`		`-#include"portability/instr_time.h"`
`28`		`-`
`29`		`-#include"libpq-fe.h"`
`30`		`-#include"pqexpbuffer.h"`
`31`		`-#include"common/logging.h"`
`32`		`-#include"fe_utils/print.h"`
`33`		`-#include"fe_utils/string_utils.h"`
`34`		`-`
	`26`	`+#include"command.h"`
`35`	`27`	`#include"common.h"`
	`28`	`+#include"common/logging.h"`
`36`	`29`	`#include"copy.h"`
`37`	`30`	`#include"crosstabview.h"`
`38`	`31`	`#include"describe.h"`
	`32`	`+#include"fe_utils/print.h"`
	`33`	`+#include"fe_utils/string_utils.h"`
`39`	`34`	`#include"help.h"`
`40`	`35`	`#include"input.h"`
`41`	`36`	`#include"large_obj.h"`
	`37`	`+#include"libpq-fe.h"`
`42`	`38`	`#include"mainloop.h"`
	`39`	`+#include"portability/instr_time.h"`
	`40`	`+#include"pqexpbuffer.h"`
`43`	`41`	`#include"psqlscanslash.h"`
`44`	`42`	`#include"settings.h"`
`45`	`43`	`#include"variables.h"`

`‎src/bin/psql/command.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,9 @@`
`8`	`8`	`#ifndefCOMMAND_H`
`9`	`9`	`#defineCOMMAND_H`
`10`	`10`
	`11`	`+#include"fe_utils/conditional.h"`
`11`	`12`	`#include"fe_utils/print.h"`
`12`	`13`	`#include"fe_utils/psqlscan.h"`
`13`		`-#include"fe_utils/conditional.h"`
`14`		`-`
`15`	`14`
`16`	`15`	`typedefenum_backslashResult`
`17`	`16`	`{`

`‎src/bin/psql/common.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`
`11`	`11`	`#include<setjmp.h>`
`12`	`12`
`13`		`-#include"libpq-fe.h"`
`14`	`13`	`#include"fe_utils/print.h"`
`15`	`14`	`#include"fe_utils/psqlscan.h"`
	`15`	`+#include"libpq-fe.h"`
`16`	`16`
`17`	`17`	`externboolopenQueryOutputFile(constcharfname,FILEfout,boolis_pipe);`
`18`	`18`	`externboolsetQFout(constchar*fname);`

`‎src/bin/psql/prompt.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`	`#ifndefPROMPT_H`
`9`	`9`	`#definePROMPT_H`
`10`	`10`
	`11`	`+#include"fe_utils/conditional.h"`
`11`	`12`	`/* enum promptStatus_t is now defined by psqlscan.h */`
`12`	`13`	`#include"fe_utils/psqlscan.h"`
`13`		`-#include"fe_utils/conditional.h"`
`14`	`14`
`15`	`15`	`char*get_prompt(promptStatus_tstatus,ConditionalStackcstack);`
`16`	`16`

`‎src/bin/psql/settings.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,8 @@`
`8`	`8`	`#ifndefSETTINGS_H`
`9`	`9`	`#defineSETTINGS_H`
`10`	`10`
`11`		`-`
`12`		`-#include"variables.h"`
`13`	`11`	`#include"fe_utils/print.h"`
	`12`	`+#include"variables.h"`
`14`	`13`
`15`	`14`	`#defineDEFAULT_CSV_FIELD_SEP ','`
`16`	`15`	`#defineDEFAULT_FIELD_SEP "\|"`

`‎src/bin/psql/tab-complete.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,9 @@`
`33`	`33`	`*/`
`34`	`34`
`35`	`35`	`#include"postgres_fe.h"`
`36`		`-#include"tab-complete.h"`
	`36`	`+`
`37`	`37`	`#include"input.h"`
	`38`	`+#include"tab-complete.h"`
`38`	`39`
`39`	`40`	`/* If we don't have this, we might as well forget about the whole thing: */`
`40`	`41`	`#ifdefUSE_READLINE`
`@@ -43,10 +44,9 @@`
`43`	`44`
`44`	`45`	`#include"catalog/pg_am_d.h"`
`45`	`46`	`#include"catalog/pg_class_d.h"`
`46`		`-`
	`47`	`+#include"common.h"`
`47`	`48`	`#include"libpq-fe.h"`
`48`	`49`	`#include"pqexpbuffer.h"`
`49`		`-#include"common.h"`
`50`	`50`	`#include"settings.h"`
`51`	`51`	`#include"stringutils.h"`
`52`	`52`

`‎src/bin/scripts/common.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@`
`10`	`10`	`#defineCOMMON_H`
`11`	`11`
`12`	`12`	`#include"common/username.h"`
`13`		`-#include"libpq-fe.h"`
`14`	`13`	`#include"getopt_long.h"/* pgrminclude ignore */`
	`14`	`+#include"libpq-fe.h"`
`15`	`15`	`#include"pqexpbuffer.h"/* pgrminclude ignore */`
`16`	`16`
`17`	`17`	`enumtrivalue`

`‎src/include/access/gin_private.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@`
`16`	`16`	`#include"access/itup.h"`
`17`	`17`	`#include"catalog/pg_am_d.h"`
`18`	`18`	`#include"fmgr.h"`
`19`		`-#include"storage/bufmgr.h"`
`20`	`19`	`#include"lib/rbtree.h"`
	`20`	`+#include"storage/bufmgr.h"`
`21`	`21`
`22`	`22`	`/*`
`23`	`23`	`* Storage type for GIN's reloptions`

`‎src/include/access/hio.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,8 @@`
`15`	`15`	`#defineHIO_H`
`16`	`16`
`17`	`17`	`#include"access/htup.h"`
`18`		`-#include"utils/relcache.h"`
`19`	`18`	`#include"storage/buf.h"`
`20`		`-`
	`19`	`+#include"utils/relcache.h"`
`21`	`20`
`22`	`21`	`/*`
`23`	`22`	`* state for bulk inserts --- private to heapam.c and hio.c`

`‎src/include/access/htup_details.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,9 @@`
`15`	`15`	`#defineHTUP_DETAILS_H`
`16`	`16`
`17`	`17`	`#include"access/htup.h"`
	`18`	`+#include"access/transam.h"`
`18`	`19`	`#include"access/tupdesc.h"`
`19`	`20`	`#include"access/tupmacs.h"`
`20`		`-#include"access/transam.h"`
`21`	`21`	`#include"storage/bufpage.h"`
`22`	`22`
`23`	`23`	`/*`

`‎src/include/access/relation.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,8 @@`
`15`	`15`	`#defineACCESS_RELATION_H`
`16`	`16`
`17`	`17`	`#include"nodes/primnodes.h"`
`18`		`-#include"utils/relcache.h"`
`19`	`18`	`#include"storage/lockdefs.h"`
`20`		`-`
	`19`	`+#include"utils/relcache.h"`
`21`	`20`
`22`	`21`	`externRelationrelation_open(OidrelationId,LOCKMODElockmode);`
`23`	`22`	`externRelationtry_relation_open(OidrelationId,LOCKMODElockmode);`

`‎src/include/access/table.h`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,8 @@`
`15`	`15`	`#defineTABLE_H`
`16`	`16`
`17`	`17`	`#include"nodes/primnodes.h"`
`18`		`-#include"utils/relcache.h"`
`19`	`18`	`#include"storage/lockdefs.h"`
`20`		`-`
	`19`	`+#include"utils/relcache.h"`
`21`	`20`
`22`	`21`	`externRelationtable_open(OidrelationId,LOCKMODElockmode);`
`23`	`22`	`externRelationtable_openrv(constRangeVar*relation,LOCKMODElockmode);`

`‎src/include/access/twophase.h`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@`
`14`	`14`	`#ifndefTWOPHASE_H`
`15`	`15`	`#defineTWOPHASE_H`
`16`	`16`
`17`		`-#include"access/xlogdefs.h"`
`18`	`17`	`#include"access/xact.h"`
	`18`	`+#include"access/xlogdefs.h"`
`19`	`19`	`#include"datatype/timestamp.h"`
`20`	`20`	`#include"storage/lock.h"`
`21`	`21`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,9 @@`
`18`	`18`	`#ifndefPG_CONSTRAINT_H`
`19`	`19`	`#definePG_CONSTRAINT_H`
`20`	`20`
	`21`	`+#include"catalog/dependency.h"`
`21`	`22`	`#include"catalog/genbki.h"`
`22`	`23`	`#include"catalog/pg_constraint_d.h"`
`23`		`-`
`24`		`-#include"catalog/dependency.h"`
`25`	`24`	`#include"nodes/pg_list.h"`
`26`	`25`
`27`	`26`	`/* ----------------`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@`
`18`	`18`	`#definePG_CONVERSION_H`
`19`	`19`
`20`	`20`	`#include"catalog/genbki.h"`
`21`		`-#include"catalog/pg_conversion_d.h"`
`22`		`-`
`23`	`21`	`#include"catalog/objectaddress.h"`
	`22`	`+#include"catalog/pg_conversion_d.h"`
`24`	`23`
`25`	`24`	`/* ----------------`
`26`	`25`	`*pg_conversion definition. cpp turns this into`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,8 @@`
`19`	`19`	`#definePG_OPERATOR_H`
`20`	`20`
`21`	`21`	`#include"catalog/genbki.h"`
`22`		`-#include"catalog/pg_operator_d.h"`
`23`		`-`
`24`	`22`	`#include"catalog/objectaddress.h"`
	`23`	`+#include"catalog/pg_operator_d.h"`
`25`	`24`	`#include"nodes/pg_list.h"`
`26`	`25`
`27`	`26`	`/* ----------------`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@`
`18`	`18`	`#definePG_PROC_H`
`19`	`19`
`20`	`20`	`#include"catalog/genbki.h"`
`21`		`-#include"catalog/pg_proc_d.h"`
`22`		`-`
`23`	`21`	`#include"catalog/objectaddress.h"`
	`22`	`+#include"catalog/pg_proc_d.h"`
`24`	`23`	`#include"nodes/pg_list.h"`
`25`	`24`
`26`	`25`	`/* ----------------`

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,8 @@`
`18`	`18`	`#definePG_PUBLICATION_H`
`19`	`19`
`20`	`20`	`#include"catalog/genbki.h"`
`21`		`-#include"catalog/pg_publication_d.h"`
`22`		`-`
`23`	`21`	`#include"catalog/objectaddress.h"`
	`22`	`+#include"catalog/pg_publication_d.h"`
`24`	`23`
`25`	`24`	`/* ----------------`
`26`	`25`	`*pg_publication definition. cpp turns this into`

0 commit comments

Comments

(0)

Movatterモバイル変換

File tree

78 files changed

Some content is hidden

78 files changed

0 commit comments