Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 7e73503

Browse files
author
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 and then Postgres header includes.  In this, we also follow that all the Postgres header includes are in order based on their ASCII value.  We generally follow these rules, but the code has deviated in many places. This commit makes it consistent just for contrib modules. The later commits will enforce similar rules in other parts of code. Author: Vignesh C Reviewed-by: Amit Kapila Discussion: https://postgr.es/m/CALDaNm2Sznv8RR6Ex-iJO6xAdsxgWhCoETkaYX=+9DW3q0QCfA@mail.gmail.com
1 parent 59c2617 commit 7e73503

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 numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
*/
1313
#include "postgres.h"
1414

15+
#include "bloom.h"
1516
#include "fmgr.h"
1617
#include "utils/selfuncs.h"
1718

18-
#include "bloom.h"
19-
2019
/*
2120
* Estimate cost of bloom index scan.
2221
*/

‎contrib/bloom/blinsert.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "access/genam.h"
1616
#include "access/generic_xlog.h"
1717
#include "access/tableam.h"
18+
#include "bloom.h"
1819
#include "catalog/index.h"
1920
#include "miscadmin.h"
2021
#include "storage/bufmgr.h"
@@ -23,8 +24,6 @@
2324
#include "utils/memutils.h"
2425
#include "utils/rel.h"
2526

26-
#include "bloom.h"
27-
2827
PG_MODULE_MAGIC;
2928

3029
/*

‎contrib/bloom/blscan.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@
1313
#include "postgres.h"
1414

1515
#include "access/relscan.h"
16-
#include "pgstat.h"
16+
#include "bloom.h"
1717
#include "miscadmin.h"
18+
#include "pgstat.h"
1819
#include "storage/bufmgr.h"
1920
#include "storage/lmgr.h"
2021
#include "utils/memutils.h"
2122
#include "utils/rel.h"
2223

23-
#include "bloom.h"
24-
2524
/*
2625
* Begin scan of bloom index.
2726
*/

‎contrib/bloom/blutils.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,15 @@
1515

1616
#include "access/amapi.h"
1717
#include "access/generic_xlog.h"
18+
#include "access/reloptions.h"
19+
#include "bloom.h"
1820
#include "catalog/index.h"
19-
#include "storage/lmgr.h"
2021
#include "miscadmin.h"
2122
#include "storage/bufmgr.h"
22-
#include "storage/indexfsm.h"
23-
#include "utils/memutils.h"
24-
#include "access/reloptions.h"
2523
#include "storage/freespace.h"
2624
#include "storage/indexfsm.h"
27-
28-
#include "bloom.h"
25+
#include "storage/lmgr.h"
26+
#include "utils/memutils.h"
2927

3028
/* Signature dealing macros - note i is assumed to be of type int */
3129
#define GETWORD(x,i) ( *( (BloomSignatureWord *)(x) + ( (i) / SIGNWORDBITS ) ) )

‎contrib/bloom/blvalidate.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include "access/amvalidate.h"
1616
#include "access/htup_details.h"
17+
#include "bloom.h"
1718
#include "catalog/pg_amop.h"
1819
#include "catalog/pg_amproc.h"
1920
#include "catalog/pg_opclass.h"
@@ -24,8 +25,6 @@
2425
#include "utils/regproc.h"
2526
#include "utils/syscache.h"
2627

27-
#include "bloom.h"
28-
2928
/*
3029
* Validator for a bloom opclass.
3130
*/

‎contrib/btree_gin/btree_gin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "utils/inet.h"
1515
#include "utils/numeric.h"
1616
#include "utils/timestamp.h"
17-
#include "utils/varbit.h"
1817
#include "utils/uuid.h"
18+
#include "utils/varbit.h"
1919

2020
PG_MODULE_MAGIC;
2121

‎contrib/btree_gist/btree_enum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* contrib/btree_gist/btree_enum.c
33
*/
44
#include "postgres.h"
5-
#include "fmgr.h"
6-
#include "utils/builtins.h"
75

86
#include "btree_gist.h"
97
#include "btree_utils_num.h"
8+
#include "fmgr.h"
9+
#include "utils/builtins.h"
1010

1111
/* enums are really Oids, so we just use the same structure */
1212

‎contrib/btree_gist/btree_inet.c

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

66
#include "btree_gist.h"
77
#include "btree_utils_num.h"
8+
#include "catalog/pg_type.h"
89
#include "utils/builtins.h"
910
#include "utils/inet.h"
10-
#include "catalog/pg_type.h"
1111

1212
typedef struct inetkey
1313
{

‎contrib/btree_gist/btree_numeric.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
*/
44
#include "postgres.h"
55

6-
#include "btree_gist.h"
7-
86
#include <math.h>
97
#include <float.h>
108

9+
#include "btree_gist.h"
1110
#include "btree_utils_var.h"
1211
#include "utils/builtins.h"
1312
#include "utils/numeric.h"

‎contrib/btree_gist/btree_utils_var.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@
33
*/
44
#include "postgres.h"
55

6-
#include "btree_gist.h"
7-
86
#include <math.h>
97
#include <limits.h>
108
#include <float.h>
119

10+
#include "btree_gist.h"
1211
#include "btree_utils_var.h"
13-
#include "utils/pg_locale.h"
1412
#include "utils/builtins.h"
13+
#include "utils/pg_locale.h"
1514
#include "utils/rel.h"
1615

1716
/* used for key sorting */

0 commit comments

Comments
 (0)