diff options
Diffstat (limited to 'src/include')
25 files changed, 61 insertions, 58 deletions
diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index 94903dd8de1..8c34935c343 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -482,9 +482,9 @@ typedef struct TableAmRoutine double *tups_recently_dead); /* - * React to VACUUM command on the relation. The VACUUM can be - * triggered by a user or by autovacuum. The specific actions - * performed by the AM will depend heavily on the individual AM. + * React to VACUUM command on the relation. The VACUUM can be triggered by + * a user or by autovacuum. The specific actions performed by the AM will + * depend heavily on the individual AM. * * On entry a transaction is already established, and the relation is * locked with a ShareUpdateExclusive lock. @@ -586,7 +586,7 @@ typedef struct TableAmRoutine * TOAST tables for this AM. If the relation_needs_toast_table callback * always returns false, this callback is not required. */ - Oid (*relation_toast_am) (Relation rel); + Oid (*relation_toast_am) (Relation rel); /* * This callback is invoked when detoasting a value stored in a toast diff --git a/src/include/access/visibilitymap.h b/src/include/access/visibilitymap.h index 22eed9abdd9..b462e90ee8f 100644 --- a/src/include/access/visibilitymap.h +++ b/src/include/access/visibilitymap.h @@ -45,6 +45,6 @@ extern void visibilitymap_set(Relation rel, BlockNumber heapBlk, Buffer heapBuf, extern uint8 visibilitymap_get_status(Relation rel, BlockNumber heapBlk, Buffer *vmbuf); extern void visibilitymap_count(Relation rel, BlockNumber *all_visible, BlockNumber *all_frozen); extern BlockNumber visibilitymap_prepare_truncate(Relation rel, - BlockNumber nheapblocks); + BlockNumber nheapblocks); #endif /* VISIBILITYMAP_H */ diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h index ec02f48da0f..5955ba0cf21 100644 --- a/src/include/catalog/pg_publication.h +++ b/src/include/catalog/pg_publication.h @@ -98,7 +98,7 @@ typedef enum PublicationPartOpt PUBLICATION_PART_ROOT, PUBLICATION_PART_LEAF, PUBLICATION_PART_ALL, -} PublicationPartOpt; +} PublicationPartOpt; extern List *GetPublicationRelations(Oid pubid, PublicationPartOpt pub_partopt); extern List *GetAllTablesPublications(void); diff --git a/src/include/catalog/pg_statistic_ext.h b/src/include/catalog/pg_statistic_ext.h index e9491a0a874..a8cb16997a7 100644 --- a/src/include/catalog/pg_statistic_ext.h +++ b/src/include/catalog/pg_statistic_ext.h @@ -41,7 +41,7 @@ CATALOG(pg_statistic_ext,3381,StatisticExtRelationId) Oid stxnamespace; /* OID of statistics object's namespace */ Oid stxowner; /* statistics object's owner */ - int32 stxstattarget BKI_DEFAULT(-1); /* statistics target */ + int32 stxstattarget BKI_DEFAULT(-1); /* statistics target */ /* * variable-length fields start here, but we allow direct access to diff --git a/src/include/commands/dbcommands_xlog.h b/src/include/commands/dbcommands_xlog.h index 4f01567eba9..7438d55ae7f 100644 --- a/src/include/commands/dbcommands_xlog.h +++ b/src/include/commands/dbcommands_xlog.h @@ -33,7 +33,7 @@ typedef struct xl_dbase_create_rec typedef struct xl_dbase_drop_rec { Oid db_id; - int ntablespaces; /* number of tablespace IDs */ + int ntablespaces; /* number of tablespace IDs */ Oid tablespace_ids[FLEXIBLE_ARRAY_MEMBER]; } xl_dbase_drop_rec; #define MinSizeOfDbaseDropRec offsetof(xl_dbase_drop_rec, tablespace_ids) diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h index 1d24b7f67e8..2edae2dd3c0 100644 --- a/src/include/common/scram-common.h +++ b/src/include/common/scram-common.h @@ -65,6 +65,6 @@ extern void scram_ClientKey(const uint8 *salted_password, uint8 *result); extern void scram_ServerKey(const uint8 *salted_password, uint8 *result); extern char *scram_build_secret(const char *salt, int saltlen, int iterations, - const char *password); + const char *password); #endif /* SCRAM_COMMON_H */ diff --git a/src/include/common/unicode_normprops_table.h b/src/include/common/unicode_normprops_table.h index 74cfaa35bf1..93a2e55b758 100644 --- a/src/include/common/unicode_normprops_table.h +++ b/src/include/common/unicode_normprops_table.h @@ -9,7 +9,7 @@ typedef struct { unsigned int codepoint:21; signed int quickcheck:4; /* really UnicodeNormalizationQC */ -} pg_unicode_normprops; +} pg_unicode_normprops; static const pg_unicode_normprops UnicodeNormProps_NFC_QC[] = { {0x0300, UNICODE_NORM_QC_MAYBE}, diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index c2b55728bfa..92c2337fd3a 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -281,10 +281,13 @@ typedef struct AggStatePerPhaseData ExprState *evaltrans; /* evaluation of transition functions */ - /* cached variants of the compiled expression */ - ExprState *evaltrans_cache - [2] /* 0: outerops; 1: TTSOpsMinimalTuple */ - [2]; /* 0: no NULL check; 1: with NULL check */ + /*---------- + * Cached variants of the compiled expression. + * first subscript: 0: outerops; 1: TTSOpsMinimalTuple + * second subscript: 0: no NULL check; 1: with NULL check + *---------- + */ + ExprState *evaltrans_cache[2][2]; } AggStatePerPhaseData; /* diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h index f7af921f5ac..90dfa8a695d 100644 --- a/src/include/lib/simplehash.h +++ b/src/include/lib/simplehash.h @@ -515,7 +515,7 @@ SH_GROW(SH_TYPE * tb, uint32 newsize) * This is a separate static inline function, so it can be reliably be inlined * into its wrapper functions even if SH_SCOPE is extern. */ -static inline SH_ELEMENT_TYPE * +static inline SH_ELEMENT_TYPE * SH_INSERT_HASH_INTERNAL(SH_TYPE * tb, SH_KEY_TYPE key, uint32 hash, bool *found) { uint32 startelem; @@ -689,7 +689,7 @@ restart: SH_SCOPE SH_ELEMENT_TYPE * SH_INSERT(SH_TYPE * tb, SH_KEY_TYPE key, bool *found) { - uint32 hash = SH_HASH_KEY(tb, key); + uint32 hash = SH_HASH_KEY(tb, key); return SH_INSERT_HASH_INTERNAL(tb, key, hash, found); } @@ -709,7 +709,7 @@ SH_INSERT_HASH(SH_TYPE * tb, SH_KEY_TYPE key, uint32 hash, bool *found) * This is a separate static inline function, so it can be reliably be inlined * into its wrapper functions even if SH_SCOPE is extern. */ -static inline SH_ELEMENT_TYPE * +static inline SH_ELEMENT_TYPE * SH_LOOKUP_HASH_INTERNAL(SH_TYPE * tb, SH_KEY_TYPE key, uint32 hash) { const uint32 startelem = SH_INITIAL_BUCKET(tb, hash); @@ -746,7 +746,7 @@ SH_LOOKUP_HASH_INTERNAL(SH_TYPE * tb, SH_KEY_TYPE key, uint32 hash) SH_SCOPE SH_ELEMENT_TYPE * SH_LOOKUP(SH_TYPE * tb, SH_KEY_TYPE key) { - uint32 hash = SH_HASH_KEY(tb, key); + uint32 hash = SH_HASH_KEY(tb, key); return SH_LOOKUP_HASH_INTERNAL(tb, key, hash); } @@ -991,8 +991,8 @@ SH_STAT(SH_TYPE * tb) } sh_log("size: " UINT64_FORMAT ", members: %u, filled: %f, total chain: %u, max chain: %u, avg chain: %f, total_collisions: %u, max_collisions: %i, avg_collisions: %f", - tb->size, tb->members, fillfactor, total_chain_length, max_chain_length, avg_chain_length, - total_collisions, max_collisions, avg_collisions); + tb->size, tb->members, fillfactor, total_chain_length, max_chain_length, avg_chain_length, + total_collisions, max_collisions, avg_collisions); } #endif /* SH_DEFINE */ diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h index ffd943ac3bd..179ebaa104b 100644 --- a/src/include/libpq/libpq-be.h +++ b/src/include/libpq/libpq-be.h @@ -289,7 +289,7 @@ extern char *be_tls_get_certificate_hash(Port *port, size_t *len); /* init hook for SSL, the default sets the password callback if appropriate */ #ifdef USE_OPENSSL -typedef void(* openssl_tls_init_hook_typ)(SSL_CTX *context, bool isServerStart); +typedef void (*openssl_tls_init_hook_typ) (SSL_CTX *context, bool isServerStart); extern PGDLLIMPORT openssl_tls_init_hook_typ openssl_tls_init_hook; #endif diff --git a/src/include/libpq/scram.h b/src/include/libpq/scram.h index 63eccd4a77b..83f1bbc996c 100644 --- a/src/include/libpq/scram.h +++ b/src/include/libpq/scram.h @@ -30,7 +30,7 @@ extern int pg_be_scram_exchange(void *opaq, const char *input, int inputlen, /* Routines to handle and check SCRAM-SHA-256 secret */ extern char *pg_be_scram_build_secret(const char *password); extern bool parse_scram_secret(const char *secret, int *iterations, char **salt, - uint8 *stored_key, uint8 *server_key); + uint8 *stored_key, uint8 *server_key); extern bool scram_verify_plain_password(const char *username, const char *password, const char *secret); diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h index 4fee043bb2b..98e0072b8ad 100644 --- a/src/include/nodes/execnodes.h +++ b/src/include/nodes/execnodes.h @@ -2036,7 +2036,7 @@ typedef struct IncrementalSortGroupInfo long totalDiskSpaceUsed; long maxMemorySpaceUsed; long totalMemorySpaceUsed; - bits32 sortMethods; /* bitmask of TuplesortMethod */ + bits32 sortMethods; /* bitmask of TuplesortMethod */ } IncrementalSortGroupInfo; typedef struct IncrementalSortInfo @@ -2161,23 +2161,23 @@ typedef struct AggState /* these fields are used in AGG_HASHED and AGG_MIXED modes: */ bool table_filled; /* hash table filled yet? */ int num_hashes; - MemoryContext hash_metacxt; /* memory for hash table itself */ + MemoryContext hash_metacxt; /* memory for hash table itself */ struct HashTapeInfo *hash_tapeinfo; /* metadata for spill tapes */ - struct HashAggSpill *hash_spills; /* HashAggSpill for each grouping set, - exists only during first pass */ - TupleTableSlot *hash_spill_slot; /* slot for reading from spill files */ + struct HashAggSpill *hash_spills; /* HashAggSpill for each grouping set, + * exists only during first pass */ + TupleTableSlot *hash_spill_slot; /* slot for reading from spill files */ List *hash_batches; /* hash batches remaining to be processed */ bool hash_ever_spilled; /* ever spilled during this execution? */ bool hash_spill_mode; /* we hit a limit during the current batch - and we must not create new groups */ - Size hash_mem_limit; /* limit before spilling hash table */ - uint64 hash_ngroups_limit; /* limit before spilling hash table */ - int hash_planned_partitions; /* number of partitions planned - for first pass */ + * and we must not create new groups */ + Size hash_mem_limit; /* limit before spilling hash table */ + uint64 hash_ngroups_limit; /* limit before spilling hash table */ + int hash_planned_partitions; /* number of partitions planned + * for first pass */ double hashentrysize; /* estimate revised during execution */ Size hash_mem_peak; /* peak hash table memory usage */ uint64 hash_ngroups_current; /* number of groups currently in - memory in all hash tables */ + * memory in all hash tables */ uint64 hash_disk_used; /* kB of disk space used */ int hash_batches_used; /* batches used during entire execution */ diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h index 96e5825a6b2..4898d90848e 100644 --- a/src/include/nodes/params.h +++ b/src/include/nodes/params.h @@ -115,7 +115,7 @@ typedef struct ParamListInfoData void *paramCompileArg; ParserSetupHook parserSetup; /* parser setup hook */ void *parserSetupArg; - char *paramValuesStr; /* params as a single string for errors */ + char *paramValuesStr; /* params as a single string for errors */ int numParams; /* nominal/maximum # of Params represented */ /* @@ -153,7 +153,7 @@ typedef struct ParamExecData /* type of argument for ParamsErrorCallback */ typedef struct ParamsErrorCbData { - const char *portalName; + const char *portalName; ParamListInfo params; } ParamsErrorCbData; @@ -164,7 +164,7 @@ extern Size EstimateParamListSpace(ParamListInfo paramLI); extern void SerializeParamList(ParamListInfo paramLI, char **start_address); extern ParamListInfo RestoreParamList(char **start_address); extern char *BuildParamLogString(ParamListInfo params, char **paramTextValues, - int valueLen); + int valueLen); extern void ParamsErrorCallback(void *arg); #endif /* PARAMS_H */ diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h index 1c83772d62b..485d1b06c91 100644 --- a/src/include/nodes/pathnodes.h +++ b/src/include/nodes/pathnodes.h @@ -740,8 +740,8 @@ typedef struct RelOptInfo /* used for partitioned relations: */ PartitionScheme part_scheme; /* Partitioning scheme */ - int nparts; /* Number of partitions; -1 if not yet set; - * in case of a join relation 0 means it's + int nparts; /* Number of partitions; -1 if not yet set; in + * case of a join relation 0 means it's * considered unpartitioned */ struct PartitionBoundInfoData *boundinfo; /* Partition bounds */ bool partbounds_merged; /* True if partition bounds were created @@ -1654,7 +1654,7 @@ typedef struct SortPath typedef struct IncrementalSortPath { SortPath spath; - int nPresortedCols; /* number of presorted columns */ + int nPresortedCols; /* number of presorted columns */ } IncrementalSortPath; /* diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 55f363f70c5..83e01074ed1 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -781,7 +781,7 @@ typedef struct Sort typedef struct IncrementalSort { Sort sort; - int nPresortedCols; /* number of presorted columns */ + int nPresortedCols; /* number of presorted columns */ } IncrementalSort; /* --------------- diff --git a/src/include/port.h b/src/include/port.h index 20a5de1b7a7..271ff0d00bc 100644 --- a/src/include/port.h +++ b/src/include/port.h @@ -383,7 +383,7 @@ extern float pg_strtof(const char *nptr, char **endptr); #endif #ifndef HAVE_LINK -extern int link(const char *src, const char *dst); +extern int link(const char *src, const char *dst); #endif #ifndef HAVE_MKDTEMP diff --git a/src/include/port/win32.h b/src/include/port/win32.h index c280c131c03..d8ae49e22d1 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -64,6 +64,6 @@ struct sockaddr_un { unsigned short sun_family; - char sun_path[108]; + char sun_path[108]; }; #define HAVE_STRUCT_SOCKADDR_UN 1 diff --git a/src/include/replication/backup_manifest.h b/src/include/replication/backup_manifest.h index 06b114f3d77..fb1291cbe4d 100644 --- a/src/include/replication/backup_manifest.h +++ b/src/include/replication/backup_manifest.h @@ -42,7 +42,7 @@ extern void AddFileToBackupManifest(backup_manifest_info *manifest, const char *spcoid, const char *pathname, size_t size, pg_time_t mtime, - pg_checksum_context * checksum_ctx); + pg_checksum_context *checksum_ctx); extern void AddWALInfoToBackupManifest(backup_manifest_info *manifest, XLogRecPtr startptr, TimeLineID starttli, XLogRecPtr endptr, diff --git a/src/include/replication/logicalrelation.h b/src/include/replication/logicalrelation.h index 4650b4f9e1b..a6b44b12bd1 100644 --- a/src/include/replication/logicalrelation.h +++ b/src/include/replication/logicalrelation.h @@ -35,7 +35,7 @@ extern void logicalrep_relmap_update(LogicalRepRelation *remoterel); extern LogicalRepRelMapEntry *logicalrep_rel_open(LogicalRepRelId remoteid, LOCKMODE lockmode); extern LogicalRepRelMapEntry *logicalrep_partition_open(LogicalRepRelMapEntry *root, - Relation partrel, AttrMap *map); + Relation partrel, AttrMap *map); extern void logicalrep_rel_close(LogicalRepRelMapEntry *rel, LOCKMODE lockmode); diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h index f1aa6e9977c..ac1acbb27ec 100644 --- a/src/include/replication/walreceiver.h +++ b/src/include/replication/walreceiver.h @@ -74,11 +74,11 @@ typedef struct TimeLineID receiveStartTLI; /* - * flushedUpto-1 is the last byte position that has already been - * received, and receivedTLI is the timeline it came from. At the first - * startup of walreceiver, these are set to receiveStart and - * receiveStartTLI. After that, walreceiver updates these whenever it - * flushes the received WAL to disk. + * flushedUpto-1 is the last byte position that has already been received, + * and receivedTLI is the timeline it came from. At the first startup of + * walreceiver, these are set to receiveStart and receiveStartTLI. After + * that, walreceiver updates these whenever it flushes the received WAL to + * disk. */ XLogRecPtr flushedUpto; TimeLineID receivedTLI; diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h index 2b14ab238cb..61e69696cfe 100644 --- a/src/include/statistics/extended_stats_internal.h +++ b/src/include/statistics/extended_stats_internal.h @@ -35,7 +35,7 @@ typedef struct DimensionInfo { int nvalues; /* number of deduplicated values */ int nbytes; /* number of bytes (serialized) */ - int nbytes_aligned; /* size of deserialized data with alignment */ + int nbytes_aligned; /* size of deserialized data with alignment */ int typlen; /* pg_type.typlen */ bool typbyval; /* pg_type.typbyval */ } DimensionInfo; diff --git a/src/include/statistics/statistics.h b/src/include/statistics/statistics.h index f5d9b6c73a9..50fce4935f3 100644 --- a/src/include/statistics/statistics.h +++ b/src/include/statistics/statistics.h @@ -100,8 +100,8 @@ extern MCVList *statext_mcv_load(Oid mvoid); extern void BuildRelationExtStatistics(Relation onerel, double totalrows, int numrows, HeapTuple *rows, int natts, VacAttrStats **vacattrstats); -extern int ComputeExtStatisticsRows(Relation onerel, - int natts, VacAttrStats **stats); +extern int ComputeExtStatisticsRows(Relation onerel, + int natts, VacAttrStats **stats); extern bool statext_is_kind_built(HeapTuple htup, char kind); extern Selectivity dependencies_clauselist_selectivity(PlannerInfo *root, List *clauses, diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h index 0c1af892062..e9e32ab8f1f 100644 --- a/src/include/storage/shmem.h +++ b/src/include/storage/shmem.h @@ -60,7 +60,7 @@ typedef struct char key[SHMEM_INDEX_KEYSIZE]; /* string name */ void *location; /* location in shared mem */ Size size; /* # bytes requested for the structure */ - Size allocated_size; /* # bytes actually allocated */ + Size allocated_size; /* # bytes actually allocated */ } ShmemIndexEnt; /* diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h index c9c68e2f4f8..91aed1f5a51 100644 --- a/src/include/utils/lsyscache.h +++ b/src/include/utils/lsyscache.h @@ -183,7 +183,7 @@ extern char *get_namespace_name_or_temp(Oid nspid); extern Oid get_range_subtype(Oid rangeOid); extern Oid get_range_collation(Oid rangeOid); extern Oid get_index_column_opclass(Oid index_oid, int attno); -extern bool get_index_isreplident(Oid index_oid); +extern bool get_index_isreplident(Oid index_oid); extern bool get_index_isvalid(Oid index_oid); extern bool get_index_isclustered(Oid index_oid); diff --git a/src/include/utils/rangetypes.h b/src/include/utils/rangetypes.h index 0cbbf090333..b77c41cf1b8 100644 --- a/src/include/utils/rangetypes.h +++ b/src/include/utils/rangetypes.h @@ -128,10 +128,10 @@ extern char range_get_flags(const RangeType *range); extern void range_set_contain_empty(RangeType *range); extern RangeType *make_range(TypeCacheEntry *typcache, RangeBound *lower, RangeBound *upper, bool empty); -extern int range_cmp_bounds(TypeCacheEntry *typcache, const RangeBound *b1, - const RangeBound *b2); -extern int range_cmp_bound_values(TypeCacheEntry *typcache, const RangeBound *b1, - const RangeBound *b2); +extern int range_cmp_bounds(TypeCacheEntry *typcache, const RangeBound *b1, + const RangeBound *b2); +extern int range_cmp_bound_values(TypeCacheEntry *typcache, const RangeBound *b1, + const RangeBound *b2); extern bool bounds_adjacent(TypeCacheEntry *typcache, RangeBound bound1, RangeBound bound2); extern RangeType *make_empty_range(TypeCacheEntry *typcache); |