Skip to content

Commit e048722

Browse files
author
Amit Kapila
committed
Make the order of the header file includes consistent.
Similar to commits 14aec03, 7e73503 and dddf4cd, this commit makes the order of header file inclusion consistent in more places. Author: Vignesh C Reviewed-by: Amit Kapila Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
1 parent 2aa8452 commit e048722

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 numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#include "access/generic_xlog.h"
1818
#include "access/itup.h"
1919
#include "access/xlog.h"
20-
#include "nodes/pathnodes.h"
2120
#include "fmgr.h"
21+
#include "nodes/pathnodes.h"
2222

2323
/* Support procedures numbers */
2424
#define BLOOM_HASH_PROC 1

‎contrib/btree_gist/btree_gist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#ifndef __BTREE_GIST_H__
55
#define __BTREE_GIST_H__
66

7-
#include "fmgr.h"
87
#include "access/nbtree.h"
8+
#include "fmgr.h"
99

1010
#define BtreeGistNotEqualStrategyNumber 6
1111

‎contrib/btree_gist/btree_utils_num.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
#ifndef __BTREE_UTILS_NUM_H__
55
#define __BTREE_UTILS_NUM_H__
66

7-
#include "btree_gist.h"
8-
#include "access/gist.h"
9-
#include "utils/rel.h"
10-
117
#include <math.h>
128
#include <float.h>
139

10+
#include "access/gist.h"
11+
#include "btree_gist.h"
12+
#include "utils/rel.h"
13+
1414
typedef char GBT_NUMKEY;
1515

1616
/* Better readable key */

‎contrib/btree_gist/btree_utils_var.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
#ifndef __BTREE_UTILS_VAR_H__
55
#define __BTREE_UTILS_VAR_H__
66

7-
#include "btree_gist.h"
8-
97
#include "access/gist.h"
8+
#include "btree_gist.h"
109
#include "mb/pg_wchar.h"
1110

1211
/* Variable length key */

‎contrib/postgres_fdw/postgres_fdw.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,10 @@
1515

1616
#include "foreign/foreign.h"
1717
#include "lib/stringinfo.h"
18+
#include "libpq-fe.h"
1819
#include "nodes/pathnodes.h"
1920
#include "utils/relcache.h"
2021

21-
#include "libpq-fe.h"
22-
2322
/*
2423
* FDW-specific planner information kept in RelOptInfo.fdw_private for a
2524
* 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 numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
#include "utils/memutils.h"
4040
#include "utils/timestamp.h"
4141

42-
4342
/*----------------------------------------------------------------
4443
* Global authentication functions
4544
*----------------------------------------------------------------

‎src/bin/pg_basebackup/receivelog.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
#ifndef RECEIVELOG_H
1313
#define RECEIVELOG_H
1414

15+
#include "access/xlogdefs.h"
1516
#include "libpq-fe.h"
1617
#include "walmethods.h"
1718

18-
#include "access/xlogdefs.h"
19-
2019
/*
2120
* Called before trying to read more data or when a segment is
2221
* finished. Return true to stop streaming.

‎src/bin/pg_basebackup/streamutil.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
#ifndef STREAMUTIL_H
1313
#define STREAMUTIL_H
1414

15-
#include "libpq-fe.h"
16-
1715
#include "access/xlogdefs.h"
1816
#include "datatype/timestamp.h"
17+
#include "libpq-fe.h"
1918

2019
extern const char *progname;
2120
extern char *connection_string;

‎src/bin/pg_dump/pg_backup_archiver.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
#ifndef __PG_BACKUP_ARCHIVE__
2525
#define __PG_BACKUP_ARCHIVE__
2626

27-
2827
#include <time.h>
2928

30-
#include "pg_backup.h"
31-
3229
#include "libpq-fe.h"
30+
#include "pg_backup.h"
3331
#include "pqexpbuffer.h"
3432

3533
#define LOBBUFSIZE 16384

‎src/bin/pg_rewind/datapagemap.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@
99
#ifndef DATAPAGEMAP_H
1010
#define DATAPAGEMAP_H
1111

12-
#include "storage/relfilenode.h"
1312
#include "storage/block.h"
14-
13+
#include "storage/relfilenode.h"
1514

1615
struct datapagemap
1716
{

‎src/bin/pg_rewind/filemap.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
#ifndef FILEMAP_H
99
#define FILEMAP_H
1010

11-
#include "storage/relfilenode.h"
12-
#include "storage/block.h"
13-
1411
#include "datapagemap.h"
12+
#include "storage/block.h"
13+
#include "storage/relfilenode.h"
1514

1615
/*
1716
* 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 numberDiff line numberDiff line change
@@ -11,15 +11,13 @@
1111
#ifndef PG_REWIND_H
1212
#define PG_REWIND_H
1313

14-
#include "datapagemap.h"
15-
1614
#include "access/timeline.h"
1715
#include "common/logging.h"
16+
#include "datapagemap.h"
1817
#include "libpq-fe.h"
1918
#include "storage/block.h"
2019
#include "storage/relfilenode.h"
2120

22-
2321
/* Configuration options */
2422
extern char *datadir_target;
2523
extern char *datadir_source;

‎src/bin/pg_waldump/pg_waldump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
#include <sys/stat.h>
1717
#include <unistd.h>
1818

19+
#include "access/transam.h"
1920
#include "access/xlog_internal.h"
2021
#include "access/xlogreader.h"
2122
#include "access/xlogrecord.h"
22-
#include "access/transam.h"
2323
#include "common/fe_memutils.h"
2424
#include "common/logging.h"
2525
#include "getopt_long.h"

‎src/bin/psql/command.c

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
* src/bin/psql/command.c
77
*/
88
#include "postgres_fe.h"
9-
#include "command.h"
109

1110
#include <ctype.h>
1211
#include <time.h>
@@ -24,22 +23,21 @@
2423
#endif
2524

2625
#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"
3527
#include "common.h"
28+
#include "common/logging.h"
3629
#include "copy.h"
3730
#include "crosstabview.h"
3831
#include "describe.h"
32+
#include "fe_utils/print.h"
33+
#include "fe_utils/string_utils.h"
3934
#include "help.h"
4035
#include "input.h"
4136
#include "large_obj.h"
37+
#include "libpq-fe.h"
4238
#include "mainloop.h"
39+
#include "portability/instr_time.h"
40+
#include "pqexpbuffer.h"
4341
#include "psqlscanslash.h"
4442
#include "settings.h"
4543
#include "variables.h"

‎src/bin/psql/command.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
#ifndef COMMAND_H
99
#define COMMAND_H
1010

11+
#include "fe_utils/conditional.h"
1112
#include "fe_utils/print.h"
1213
#include "fe_utils/psqlscan.h"
13-
#include "fe_utils/conditional.h"
14-
1514

1615
typedef enum _backslashResult
1716
{

‎src/bin/psql/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
#include <setjmp.h>
1212

13-
#include "libpq-fe.h"
1413
#include "fe_utils/print.h"
1514
#include "fe_utils/psqlscan.h"
15+
#include "libpq-fe.h"
1616

1717
extern bool openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe);
1818
extern bool setQFout(const char *fname);

‎src/bin/psql/prompt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#ifndef PROMPT_H
99
#define PROMPT_H
1010

11+
#include "fe_utils/conditional.h"
1112
/* enum promptStatus_t is now defined by psqlscan.h */
1213
#include "fe_utils/psqlscan.h"
13-
#include "fe_utils/conditional.h"
1414

1515
char *get_prompt(promptStatus_t status, ConditionalStack cstack);
1616

‎src/bin/psql/settings.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
#ifndef SETTINGS_H
99
#define SETTINGS_H
1010

11-
12-
#include "variables.h"
1311
#include "fe_utils/print.h"
12+
#include "variables.h"
1413

1514
#define DEFAULT_CSV_FIELD_SEP ','
1615
#define DEFAULT_FIELD_SEP "|"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@
3333
*/
3434

3535
#include "postgres_fe.h"
36-
#include "tab-complete.h"
36+
3737
#include "input.h"
38+
#include "tab-complete.h"
3839

3940
/* If we don't have this, we might as well forget about the whole thing: */
4041
#ifdef USE_READLINE
@@ -43,10 +44,9 @@
4344

4445
#include "catalog/pg_am_d.h"
4546
#include "catalog/pg_class_d.h"
46-
47+
#include "common.h"
4748
#include "libpq-fe.h"
4849
#include "pqexpbuffer.h"
49-
#include "common.h"
5050
#include "settings.h"
5151
#include "stringutils.h"
5252

‎src/bin/scripts/common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
#define COMMON_H
1111

1212
#include "common/username.h"
13-
#include "libpq-fe.h"
1413
#include "getopt_long.h" /* pgrminclude ignore */
14+
#include "libpq-fe.h"
1515
#include "pqexpbuffer.h" /* pgrminclude ignore */
1616

1717
enum trivalue

‎src/include/access/gin_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
#include "access/itup.h"
1717
#include "catalog/pg_am_d.h"
1818
#include "fmgr.h"
19-
#include "storage/bufmgr.h"
2019
#include "lib/rbtree.h"
20+
#include "storage/bufmgr.h"
2121

2222
/*
2323
* Storage type for GIN's reloptions

‎src/include/access/hio.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
#define HIO_H
1616

1717
#include "access/htup.h"
18-
#include "utils/relcache.h"
1918
#include "storage/buf.h"
20-
19+
#include "utils/relcache.h"
2120

2221
/*
2322
* 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 numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#define HTUP_DETAILS_H
1616

1717
#include "access/htup.h"
18+
#include "access/transam.h"
1819
#include "access/tupdesc.h"
1920
#include "access/tupmacs.h"
20-
#include "access/transam.h"
2121
#include "storage/bufpage.h"
2222

2323
/*

‎src/include/access/relation.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
#define ACCESS_RELATION_H
1616

1717
#include "nodes/primnodes.h"
18-
#include "utils/relcache.h"
1918
#include "storage/lockdefs.h"
20-
19+
#include "utils/relcache.h"
2120

2221
extern Relation relation_open(Oid relationId, LOCKMODE lockmode);
2322
extern Relation try_relation_open(Oid relationId, LOCKMODE lockmode);

‎src/include/access/table.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@
1515
#define TABLE_H
1616

1717
#include "nodes/primnodes.h"
18-
#include "utils/relcache.h"
1918
#include "storage/lockdefs.h"
20-
19+
#include "utils/relcache.h"
2120

2221
extern Relation table_open(Oid relationId, LOCKMODE lockmode);
2322
extern Relation table_openrv(const RangeVar *relation, LOCKMODE lockmode);

‎src/include/access/twophase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#ifndef TWOPHASE_H
1515
#define TWOPHASE_H
1616

17-
#include "access/xlogdefs.h"
1817
#include "access/xact.h"
18+
#include "access/xlogdefs.h"
1919
#include "datatype/timestamp.h"
2020
#include "storage/lock.h"
2121

‎src/include/catalog/pg_constraint.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
#ifndef PG_CONSTRAINT_H
1919
#define PG_CONSTRAINT_H
2020

21+
#include "catalog/dependency.h"
2122
#include "catalog/genbki.h"
2223
#include "catalog/pg_constraint_d.h"
23-
24-
#include "catalog/dependency.h"
2524
#include "nodes/pg_list.h"
2625

2726
/* ----------------

‎src/include/catalog/pg_conversion.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#define PG_CONVERSION_H
1919

2020
#include "catalog/genbki.h"
21-
#include "catalog/pg_conversion_d.h"
22-
2321
#include "catalog/objectaddress.h"
22+
#include "catalog/pg_conversion_d.h"
2423

2524
/* ----------------
2625
* pg_conversion definition. cpp turns this into

‎src/include/catalog/pg_operator.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
#define PG_OPERATOR_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_operator_d.h"
23-
2422
#include "catalog/objectaddress.h"
23+
#include "catalog/pg_operator_d.h"
2524
#include "nodes/pg_list.h"
2625

2726
/* ----------------

‎src/include/catalog/pg_proc.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#define PG_PROC_H
1919

2020
#include "catalog/genbki.h"
21-
#include "catalog/pg_proc_d.h"
22-
2321
#include "catalog/objectaddress.h"
22+
#include "catalog/pg_proc_d.h"
2423
#include "nodes/pg_list.h"
2524

2625
/* ----------------

‎src/include/catalog/pg_publication.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
#define PG_PUBLICATION_H
1919

2020
#include "catalog/genbki.h"
21-
#include "catalog/pg_publication_d.h"
22-
2321
#include "catalog/objectaddress.h"
22+
#include "catalog/pg_publication_d.h"
2423

2524
/* ----------------
2625
* pg_publication definition. cpp turns this into

0 commit comments

Comments
 (0)