diff options
Diffstat (limited to 'src/backend/utils')
32 files changed, 45 insertions, 63 deletions
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 79bc750d775..4ccb3c040c0 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -19,10 +19,10 @@ #include "access/htup_details.h" #include "catalog/catalog.h" #include "catalog/namespace.h" -#include "catalog/pg_authid.h" #include "catalog/pg_auth_members.h" -#include "catalog/pg_type.h" +#include "catalog/pg_authid.h" #include "catalog/pg_class.h" +#include "catalog/pg_type.h" #include "commands/dbcommands.h" #include "commands/proclang.h" #include "commands/tablespace.h" @@ -41,7 +41,6 @@ #include "utils/syscache.h" #include "utils/varlena.h" - typedef struct { const char *name; diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c index e38bd930543..c911d7223c2 100644 --- a/src/backend/utils/adt/datetime.c +++ b/src/backend/utils/adt/datetime.c @@ -31,7 +31,6 @@ #include "utils/memutils.h" #include "utils/tzparser.h" - static int DecodeNumber(int flen, char *field, bool haveTextMonth, int fmask, int *tmask, struct pg_tm *tm, fsec_t *fsec, bool *is2digits); diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c index 6ae2a31345f..b6befd6d069 100644 --- a/src/backend/utils/adt/format_type.c +++ b/src/backend/utils/adt/format_type.c @@ -20,11 +20,11 @@ #include "access/htup_details.h" #include "catalog/namespace.h" #include "catalog/pg_type.h" +#include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/numeric.h" #include "utils/syscache.h" -#include "mb/pg_wchar.h" static char *printTypmod(const char *typname, int32 typmod, Oid typmodout); diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c index 93acabce42c..a40ae40dff5 100644 --- a/src/backend/utils/adt/int8.c +++ b/src/backend/utils/adt/int8.c @@ -23,9 +23,8 @@ #include "nodes/nodeFuncs.h" #include "nodes/supportnodes.h" #include "optimizer/optimizer.h" -#include "utils/int8.h" #include "utils/builtins.h" - +#include "utils/int8.h" #define MAXINT8LEN 25 diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c index d4ba3bd87db..e2e16eb5ea2 100644 --- a/src/backend/utils/adt/json.c +++ b/src/backend/utils/adt/json.c @@ -27,11 +27,11 @@ #include "utils/builtins.h" #include "utils/date.h" #include "utils/datetime.h" -#include "utils/lsyscache.h" #include "utils/json.h" #include "utils/jsonapi.h" -#include "utils/typcache.h" +#include "utils/lsyscache.h" #include "utils/syscache.h" +#include "utils/typcache.h" /* * The context of the parser is maintained by the recursive descent diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c index 74b4bbe44c6..9927d0879a3 100644 --- a/src/backend/utils/adt/jsonb.c +++ b/src/backend/utils/adt/jsonb.c @@ -12,20 +12,20 @@ */ #include "postgres.h" -#include "miscadmin.h" #include "access/htup_details.h" #include "access/transam.h" #include "catalog/pg_type.h" #include "funcapi.h" #include "libpq/pqformat.h" +#include "miscadmin.h" #include "parser/parse_coerce.h" #include "utils/builtins.h" #include "utils/date.h" #include "utils/datetime.h" -#include "utils/lsyscache.h" #include "utils/json.h" #include "utils/jsonapi.h" #include "utils/jsonb.h" +#include "utils/lsyscache.h" #include "utils/syscache.h" #include "utils/typcache.h" diff --git a/src/backend/utils/adt/jsonpath_exec.c b/src/backend/utils/adt/jsonpath_exec.c index e2c1bfb5a77..fb5947ae738 100644 --- a/src/backend/utils/adt/jsonpath_exec.c +++ b/src/backend/utils/adt/jsonpath_exec.c @@ -66,18 +66,17 @@ #include "miscadmin.h" #include "regex/regex.h" #include "utils/builtins.h" +#include "utils/date.h" #include "utils/datetime.h" #include "utils/datum.h" -#include "utils/formatting.h" #include "utils/float.h" +#include "utils/formatting.h" #include "utils/guc.h" #include "utils/json.h" #include "utils/jsonpath.h" -#include "utils/date.h" #include "utils/timestamp.h" #include "utils/varlena.h" - /* * Represents "base object" and it's "id" for .keyvalue() evaluation. */ diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c index d330a88e3c1..27474a62535 100644 --- a/src/backend/utils/adt/misc.c +++ b/src/backend/utils/adt/misc.c @@ -29,18 +29,17 @@ #include "common/keywords.h" #include "funcapi.h" #include "miscadmin.h" -#include "pgstat.h" #include "parser/scansup.h" +#include "pgstat.h" #include "postmaster/syslogger.h" #include "rewrite/rewriteHandler.h" #include "storage/fd.h" -#include "utils/lsyscache.h" -#include "utils/ruleutils.h" #include "tcop/tcopprot.h" #include "utils/builtins.h" +#include "utils/lsyscache.h" +#include "utils/ruleutils.h" #include "utils/timestamp.h" - /* * Common subroutine for num_nulls() and num_nonnulls(). * Returns true if successful, false if function should return NULL. diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c index 0fdfee58253..9557732b827 100644 --- a/src/backend/utils/adt/oracle_compat.c +++ b/src/backend/utils/adt/oracle_compat.c @@ -16,10 +16,9 @@ #include "postgres.h" #include "common/int.h" +#include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/formatting.h" -#include "mb/pg_wchar.h" - static text *dotrim(const char *string, int stringlen, const char *set, int setlen, diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c index cf73f4d8c14..96b22b773ca 100644 --- a/src/backend/utils/adt/rangetypes_gist.c +++ b/src/backend/utils/adt/rangetypes_gist.c @@ -16,12 +16,11 @@ #include "access/gist.h" #include "access/stratnum.h" +#include "utils/datum.h" #include "utils/float.h" #include "utils/fmgrprotos.h" -#include "utils/datum.h" #include "utils/rangetypes.h" - /* * Range class properties used to segregate different classes of ranges in * GiST. Each unique combination of properties is a class. CLS_EMPTY cannot diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c index 17a7f6c9d83..4b1decf81e6 100644 --- a/src/backend/utils/adt/regproc.c +++ b/src/backend/utils/adt/regproc.c @@ -33,11 +33,11 @@ #include "miscadmin.h" #include "parser/parse_type.h" #include "parser/scansup.h" +#include "utils/acl.h" #include "utils/builtins.h" #include "utils/lsyscache.h" -#include "utils/syscache.h" -#include "utils/acl.h" #include "utils/regproc.h" +#include "utils/syscache.h" #include "utils/varlena.h" static char *format_operator_internal(Oid operator_oid, bool force_qualify); diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c index caf27f8bcb4..22b07dfd06d 100644 --- a/src/backend/utils/adt/ri_triggers.c +++ b/src/backend/utils/adt/ri_triggers.c @@ -36,9 +36,9 @@ #include "executor/executor.h" #include "executor/spi.h" #include "lib/ilist.h" +#include "miscadmin.h" #include "parser/parse_coerce.h" #include "parser/parse_relation.h" -#include "miscadmin.h" #include "storage/bufmgr.h" #include "utils/acl.h" #include "utils/builtins.h" @@ -54,7 +54,6 @@ #include "utils/snapmgr.h" #include "utils/syscache.h" - /* * Local definitions */ diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index 3e64390d819..c1de869c521 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -50,9 +50,9 @@ #include "nodes/makefuncs.h" #include "nodes/nodeFuncs.h" #include "optimizer/optimizer.h" -#include "parser/parse_node.h" #include "parser/parse_agg.h" #include "parser/parse_func.h" +#include "parser/parse_node.h" #include "parser/parse_oper.h" #include "parser/parser.h" #include "parser/parsetree.h" @@ -74,7 +74,6 @@ #include "utils/varlena.h" #include "utils/xml.h" - /* ---------- * Pretty formatting constants * ---------- diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c index ab2b49fdc46..4f574b3ba85 100644 --- a/src/backend/utils/adt/tsquery.c +++ b/src/backend/utils/adt/tsquery.c @@ -16,8 +16,8 @@ #include "libpq/pqformat.h" #include "miscadmin.h" -#include "tsearch/ts_type.h" #include "tsearch/ts_locale.h" +#include "tsearch/ts_type.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" #include "utils/memutils.h" diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c index af075637e1d..217de77a78e 100644 --- a/src/backend/utils/adt/tsquery_cleanup.c +++ b/src/backend/utils/adt/tsquery_cleanup.c @@ -15,8 +15,8 @@ #include "postgres.h" -#include "tsearch/ts_utils.h" #include "miscadmin.h" +#include "tsearch/ts_utils.h" typedef struct NODE { diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c index 91200eecf6e..282fb2ddb79 100644 --- a/src/backend/utils/adt/tsquery_gist.c +++ b/src/backend/utils/adt/tsquery_gist.c @@ -14,8 +14,8 @@ #include "postgres.h" -#include "access/stratnum.h" #include "access/gist.h" +#include "access/stratnum.h" #include "tsearch/ts_utils.h" #include "utils/builtins.h" diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c index de46a00ba83..7cb19db2524 100644 --- a/src/backend/utils/adt/tsquery_util.c +++ b/src/backend/utils/adt/tsquery_util.c @@ -14,8 +14,8 @@ #include "postgres.h" -#include "tsearch/ts_utils.h" #include "miscadmin.h" +#include "tsearch/ts_utils.h" /* * Build QTNode tree for a tsquery given in QueryItem array format. diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c index e28859d8e1c..2d8359de270 100644 --- a/src/backend/utils/adt/tsrank.c +++ b/src/backend/utils/adt/tsrank.c @@ -16,11 +16,10 @@ #include <limits.h> #include <math.h> +#include "miscadmin.h" #include "tsearch/ts_utils.h" #include "utils/array.h" #include "utils/builtins.h" -#include "miscadmin.h" - static const float weights[] = {0.1f, 0.2f, 0.4f, 1.0f}; diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c index e220c5f1364..06bf5a93ab4 100644 --- a/src/backend/utils/adt/txid.c +++ b/src/backend/utils/adt/txid.c @@ -26,16 +26,15 @@ #include "access/xact.h" #include "access/xlog.h" #include "funcapi.h" -#include "miscadmin.h" #include "lib/qunique.h" #include "libpq/pqformat.h" +#include "miscadmin.h" #include "postmaster/postmaster.h" #include "storage/lwlock.h" #include "utils/builtins.h" #include "utils/memutils.h" #include "utils/snapmgr.h" - /* txid will be signed int8 in database, so must limit to 63 bits */ #define MAX_TXID ((uint64) PG_INT64_MAX) diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c index e63a4e553b2..2aed4119740 100644 --- a/src/backend/utils/adt/varchar.c +++ b/src/backend/utils/adt/varchar.c @@ -18,6 +18,7 @@ #include "catalog/pg_collation.h" #include "catalog/pg_type.h" #include "libpq/pqformat.h" +#include "mb/pg_wchar.h" #include "nodes/nodeFuncs.h" #include "nodes/supportnodes.h" #include "utils/array.h" @@ -26,8 +27,6 @@ #include "utils/lsyscache.h" #include "utils/pg_locale.h" #include "utils/varlena.h" -#include "mb/pg_wchar.h" - /* common code for bpchartypmodin and varchartypmodin */ static int32 diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c index 419bde567bd..1b0f7383212 100644 --- a/src/backend/utils/cache/evtcache.c +++ b/src/backend/utils/cache/evtcache.c @@ -16,17 +16,17 @@ #include "access/genam.h" #include "access/htup_details.h" #include "access/relation.h" -#include "catalog/pg_event_trigger.h" #include "catalog/indexing.h" +#include "catalog/pg_event_trigger.h" #include "catalog/pg_type.h" #include "commands/trigger.h" #include "utils/array.h" #include "utils/builtins.h" #include "utils/catcache.h" #include "utils/evtcache.h" +#include "utils/hsearch.h" #include "utils/inval.h" #include "utils/memutils.h" -#include "utils/hsearch.h" #include "utils/rel.h" #include "utils/snapmgr.h" #include "utils/syscache.h" diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 585dcee5dbc..ad1ff01b320 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -47,8 +47,8 @@ #include "catalog/pg_am.h" #include "catalog/pg_amproc.h" #include "catalog/pg_attrdef.h" -#include "catalog/pg_authid.h" #include "catalog/pg_auth_members.h" +#include "catalog/pg_authid.h" #include "catalog/pg_constraint.h" #include "catalog/pg_database.h" #include "catalog/pg_namespace.h" @@ -90,7 +90,6 @@ #include "utils/snapmgr.h" #include "utils/syscache.h" - #define RELCACHE_INIT_FILEMAGIC 0x573266 /* version ID value */ /* diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c index c506dc9dec4..d244eaf4d8c 100644 --- a/src/backend/utils/cache/relfilenodemap.c +++ b/src/backend/utils/cache/relfilenodemap.c @@ -22,9 +22,9 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/catcache.h" +#include "utils/fmgroids.h" #include "utils/hsearch.h" #include "utils/inval.h" -#include "utils/fmgroids.h" #include "utils/rel.h" #include "utils/relfilenodemap.h" #include "utils/relmapper.h" diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 36aee74ab02..d69c0ff8139 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -53,13 +53,13 @@ #include "catalog/pg_publication.h" #include "catalog/pg_publication_rel.h" #include "catalog/pg_range.h" +#include "catalog/pg_replication_origin.h" #include "catalog/pg_rewrite.h" #include "catalog/pg_seclabel.h" #include "catalog/pg_sequence.h" #include "catalog/pg_shdepend.h" #include "catalog/pg_shdescription.h" #include "catalog/pg_shseclabel.h" -#include "catalog/pg_replication_origin.h" #include "catalog/pg_statistic.h" #include "catalog/pg_statistic_ext.h" #include "catalog/pg_statistic_ext_data.h" @@ -75,11 +75,10 @@ #include "catalog/pg_type.h" #include "catalog/pg_user_mapping.h" #include "lib/qunique.h" -#include "utils/rel.h" #include "utils/catcache.h" +#include "utils/rel.h" #include "utils/syscache.h" - /*--------------------------------------------------------------------------- Adding system caches: diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 29c5ec7b58b..cc38669a1eb 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -46,9 +46,9 @@ #include "storage/fd.h" #include "storage/ipc.h" #include "storage/lmgr.h" +#include "storage/proc.h" #include "storage/procarray.h" #include "storage/procsignal.h" -#include "storage/proc.h" #include "storage/sinvaladt.h" #include "storage/smgr.h" #include "storage/sync.h" @@ -64,7 +64,6 @@ #include "utils/syscache.h" #include "utils/timeout.h" - static HeapTuple GetDatabaseTuple(const char *dbname); static HeapTuple GetDatabaseTupleByOid(Oid dboid); static void PerformAuthentication(Port *port); diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 994bf37477a..4b3769b8b05 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -38,10 +38,10 @@ #include "catalog/pg_authid.h" #include "commands/async.h" #include "commands/prepare.h" +#include "commands/trigger.h" #include "commands/user.h" #include "commands/vacuum.h" #include "commands/variable.h" -#include "commands/trigger.h" #include "common/string.h" #include "funcapi.h" #include "jit/jit.h" @@ -72,18 +72,18 @@ #include "replication/walsender.h" #include "storage/bufmgr.h" #include "storage/dsm_impl.h" -#include "storage/standby.h" #include "storage/fd.h" #include "storage/large_object.h" #include "storage/pg_shmem.h" -#include "storage/proc.h" #include "storage/predicate.h" +#include "storage/proc.h" +#include "storage/standby.h" #include "tcop/tcopprot.h" #include "tsearch/ts_cache.h" #include "utils/builtins.h" #include "utils/bytea.h" -#include "utils/guc_tables.h" #include "utils/float.h" +#include "utils/guc_tables.h" #include "utils/memutils.h" #include "utils/pg_locale.h" #include "utils/pg_lsn.h" diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c index 2d178391ab5..8cab0e1c0b1 100644 --- a/src/backend/utils/misc/pg_config.c +++ b/src/backend/utils/misc/pg_config.c @@ -14,12 +14,12 @@ #include "postgres.h" -#include "funcapi.h" -#include "miscadmin.h" #include "catalog/pg_type.h" #include "common/config_info.h" -#include "utils/builtins.h" +#include "funcapi.h" +#include "miscadmin.h" #include "port.h" +#include "utils/builtins.h" Datum pg_config(PG_FUNCTION_ARGS) diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c index b42921800b7..3d0916fea70 100644 --- a/src/backend/utils/misc/pg_controldata.c +++ b/src/backend/utils/misc/pg_controldata.c @@ -17,8 +17,8 @@ #include "access/htup_details.h" #include "access/transam.h" -#include "access/xlog_internal.h" #include "access/xlog.h" +#include "access/xlog_internal.h" #include "catalog/pg_control.h" #include "catalog/pg_type.h" #include "common/controldata_utils.h" diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c index 67ba95c5f7d..6c851dd4982 100644 --- a/src/backend/utils/misc/ps_status.c +++ b/src/backend/utils/misc/ps_status.c @@ -28,8 +28,8 @@ #include "libpq/libpq.h" #include "miscadmin.h" -#include "utils/ps_status.h" #include "utils/guc.h" +#include "utils/ps_status.h" extern char **environ; bool update_process_title = true; diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c index 56360817d9e..327dca65cf0 100644 --- a/src/backend/utils/misc/superuser.c +++ b/src/backend/utils/misc/superuser.c @@ -22,10 +22,9 @@ #include "access/htup_details.h" #include "catalog/pg_authid.h" +#include "miscadmin.h" #include "utils/inval.h" #include "utils/syscache.h" -#include "miscadmin.h" - /* * In common cases the same roleid (ie, the session or current ID) will diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c index 50deb354c28..db1dac30222 100644 --- a/src/backend/utils/mmgr/slab.c +++ b/src/backend/utils/mmgr/slab.c @@ -52,10 +52,9 @@ #include "postgres.h" +#include "lib/ilist.h" #include "utils/memdebug.h" #include "utils/memutils.h" -#include "lib/ilist.h" - /* * SlabContext is a specialized implementation of MemoryContext. diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c index deb9af5ee7a..16d464d9b7d 100644 --- a/src/backend/utils/time/combocid.c +++ b/src/backend/utils/time/combocid.c @@ -41,15 +41,14 @@ #include "postgres.h" -#include "miscadmin.h" #include "access/htup_details.h" #include "access/xact.h" +#include "miscadmin.h" #include "storage/shmem.h" #include "utils/combocid.h" #include "utils/hsearch.h" #include "utils/memutils.h" - /* Hash table to lookup combo cids by cmin and cmax */ static HTAB *comboHash = NULL; |