diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/access/amapi.h | 2 | ||||
-rw-r--r-- | src/include/access/gist_private.h | 1 | ||||
-rw-r--r-- | src/include/access/tableam.h | 2 | ||||
-rw-r--r-- | src/include/access/xlogreader.h | 1 | ||||
-rw-r--r-- | src/include/catalog/pg_auth_members.h | 2 | ||||
-rw-r--r-- | src/include/catalog/pg_subscription.h | 6 | ||||
-rw-r--r-- | src/include/executor/hashjoin.h | 2 | ||||
-rw-r--r-- | src/include/executor/tuptable.h | 2 | ||||
-rw-r--r-- | src/include/fe_utils/print.h | 17 | ||||
-rw-r--r-- | src/include/funcapi.h | 1 | ||||
-rw-r--r-- | src/include/partitioning/partprune.h | 8 | ||||
-rw-r--r-- | src/include/port/win32ntdll.h | 6 | ||||
-rw-r--r-- | src/include/replication/reorderbuffer.h | 2 | ||||
-rw-r--r-- | src/include/storage/bufmgr.h | 2 | ||||
-rw-r--r-- | src/include/storage/lock.h | 2 | ||||
-rw-r--r-- | src/include/storage/lwlock.h | 9 | ||||
-rw-r--r-- | src/include/storage/predicate_internals.h | 2 | ||||
-rw-r--r-- | src/include/storage/proc.h | 6 | ||||
-rw-r--r-- | src/include/utils/backend_status.h | 4 | ||||
-rw-r--r-- | src/include/utils/pg_locale.h | 10 | ||||
-rw-r--r-- | src/include/utils/rel.h | 2 | ||||
-rw-r--r-- | src/include/utils/varlena.h | 2 |
22 files changed, 50 insertions, 41 deletions
diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h index 281039ef67..4476ff7fba 100644 --- a/src/include/access/amapi.h +++ b/src/include/access/amapi.h @@ -245,7 +245,7 @@ typedef struct IndexAmRoutine /* does AM use maintenance_work_mem? */ bool amusemaintenanceworkmem; /* does AM store tuple information only at block granularity? */ - bool amsummarizing; + bool amsummarizing; /* OR of parallel vacuum flags. See vacuum.h for flags. */ uint8 amparallelvacuumoptions; /* type of data stored in index, or InvalidOid if variable */ diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h index ee275650bd..3edc740a3f 100644 --- a/src/include/access/gist_private.h +++ b/src/include/access/gist_private.h @@ -550,6 +550,7 @@ extern void gistSplitByKey(Relation r, Page page, IndexTuple *itup, /* gistbuild.c */ extern IndexBuildResult *gistbuild(Relation heap, Relation index, struct IndexInfo *indexInfo); + /* gistbuildbuffers.c */ extern GISTBuildBuffers *gistInitBuildBuffers(int pagesPerBuffer, int levelStep, int maxLevel); diff --git a/src/include/access/tableam.h b/src/include/access/tableam.h index bb6d4f0315..0a19a233db 100644 --- a/src/include/access/tableam.h +++ b/src/include/access/tableam.h @@ -902,7 +902,7 @@ table_beginscan(Relation rel, Snapshot snapshot, int nkeys, struct ScanKeyData *key) { uint32 flags = SO_TYPE_SEQSCAN | - SO_ALLOW_STRAT | SO_ALLOW_SYNC | SO_ALLOW_PAGEMODE; + SO_ALLOW_STRAT | SO_ALLOW_SYNC | SO_ALLOW_PAGEMODE; return rel->rd_tableam->scan_begin(rel, snapshot, nkeys, key, NULL, flags); } diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h index 30d20c323e..da32c7db77 100644 --- a/src/include/access/xlogreader.h +++ b/src/include/access/xlogreader.h @@ -332,6 +332,7 @@ extern XLogReaderState *XLogReaderAllocate(int wal_segment_size, const char *waldir, XLogReaderRoutine *routine, void *private_data); + /* Free an XLogReader */ extern void XLogReaderFree(XLogReaderState *state); diff --git a/src/include/catalog/pg_auth_members.h b/src/include/catalog/pg_auth_members.h index b8c751b9d1..3a313001fa 100644 --- a/src/include/catalog/pg_auth_members.h +++ b/src/include/catalog/pg_auth_members.h @@ -34,7 +34,7 @@ CATALOG(pg_auth_members,1261,AuthMemRelationId) BKI_SHARED_RELATION BKI_ROWTYPE_ Oid member BKI_LOOKUP(pg_authid); /* ID of a member of that role */ Oid grantor BKI_LOOKUP(pg_authid); /* who granted the membership */ bool admin_option; /* granted with admin option? */ - bool inherit_option; /* exercise privileges without SET ROLE? */ + bool inherit_option; /* exercise privileges without SET ROLE? */ bool set_option; /* use SET ROLE to the target role? */ } FormData_pg_auth_members; diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h index 91d729d62d..1d40eebc78 100644 --- a/src/include/catalog/pg_subscription.h +++ b/src/include/catalog/pg_subscription.h @@ -88,10 +88,10 @@ CATALOG(pg_subscription,6100,SubscriptionRelationId) BKI_SHARED_RELATION BKI_ROW bool subdisableonerr; /* True if a worker error should cause the * subscription to be disabled */ - bool subpasswordrequired; /* Must connection use a password? */ + bool subpasswordrequired; /* Must connection use a password? */ - bool subrunasowner; /* True if replication should execute as - * the subscription owner */ + bool subrunasowner; /* True if replication should execute as the + * subscription owner */ #ifdef CATALOG_VARLEN /* variable-length fields start here */ /* Connection string to the publisher */ diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h index 8ee59d2c71..0a1c8ff7c4 100644 --- a/src/include/executor/hashjoin.h +++ b/src/include/executor/hashjoin.h @@ -360,6 +360,6 @@ typedef struct HashJoinTableData ParallelHashJoinState *parallel_state; ParallelHashJoinBatchAccessor *batches; dsa_pointer current_chunk_shared; -} HashJoinTableData; +} HashJoinTableData; #endif /* HASHJOIN_H */ diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h index ff64b7cb98..3d34575a22 100644 --- a/src/include/executor/tuptable.h +++ b/src/include/executor/tuptable.h @@ -409,7 +409,7 @@ slot_getattr(TupleTableSlot *slot, int attnum, static inline Datum slot_getsysattr(TupleTableSlot *slot, int attnum, bool *isnull) { - Assert(attnum < 0); /* caller error */ + Assert(attnum < 0); /* caller error */ if (attnum == TableOidAttributeNumber) { diff --git a/src/include/fe_utils/print.h b/src/include/fe_utils/print.h index 54f783c907..cc6652def9 100644 --- a/src/include/fe_utils/print.h +++ b/src/include/fe_utils/print.h @@ -69,10 +69,13 @@ typedef enum printTextLineWrap typedef enum printXheaderWidthType { /* Expanded header line width variants */ - PRINT_XHEADER_FULL, /* do not truncate header line (this is the default) */ - PRINT_XHEADER_COLUMN, /* only print header line above the first column */ - PRINT_XHEADER_PAGE, /* header line must not be longer than terminal width */ - PRINT_XHEADER_EXACT_WIDTH, /* explicitly specified width */ + PRINT_XHEADER_FULL, /* do not truncate header line (this is the + * default) */ + PRINT_XHEADER_COLUMN, /* only print header line above the first + * column */ + PRINT_XHEADER_PAGE, /* header line must not be longer than + * terminal width */ + PRINT_XHEADER_EXACT_WIDTH, /* explicitly specified width */ } printXheaderWidthType; typedef struct printTextFormat @@ -110,8 +113,10 @@ typedef struct printTableOpt enum printFormat format; /* see enum above */ unsigned short int expanded; /* expanded/vertical output (if supported * by output format); 0=no, 1=yes, 2=auto */ - printXheaderWidthType expanded_header_width_type; /* width type for header line in expanded mode */ - int expanded_header_exact_width; /* explicit width for header line in expanded mode */ + printXheaderWidthType expanded_header_width_type; /* width type for header + * line in expanded mode */ + int expanded_header_exact_width; /* explicit width for header + * line in expanded mode */ unsigned short int border; /* Print a border around the table. 0=none, * 1=dividing lines, 2=full */ unsigned short int pager; /* use pager for output (if to stdout and diff --git a/src/include/funcapi.h b/src/include/funcapi.h index 11febb138b..cc0cca3272 100644 --- a/src/include/funcapi.h +++ b/src/include/funcapi.h @@ -231,6 +231,7 @@ HeapTupleGetDatum(const HeapTupleData *tuple) { return HeapTupleHeaderGetDatum(tuple->t_data); } + /* obsolete version of above */ #define TupleGetDatum(_slot, _tuple) HeapTupleGetDatum(_tuple) diff --git a/src/include/partitioning/partprune.h b/src/include/partitioning/partprune.h index c0d6889d47..d4b7a1c910 100644 --- a/src/include/partitioning/partprune.h +++ b/src/include/partitioning/partprune.h @@ -70,10 +70,10 @@ typedef struct PartitionPruneContext #define PruneCxtStateIdx(partnatts, step_id, keyno) \ ((partnatts) * (step_id) + (keyno)) -extern int make_partition_pruneinfo(struct PlannerInfo *root, - struct RelOptInfo *parentrel, - List *subpaths, - List *prunequal); +extern int make_partition_pruneinfo(struct PlannerInfo *root, + struct RelOptInfo *parentrel, + List *subpaths, + List *prunequal); extern Bitmapset *prune_append_rel_partitions(struct RelOptInfo *rel); extern Bitmapset *get_matching_partitions(PartitionPruneContext *context, List *pruning_steps); diff --git a/src/include/port/win32ntdll.h b/src/include/port/win32ntdll.h index 18ff6f4b41..1ce9360ec1 100644 --- a/src/include/port/win32ntdll.h +++ b/src/include/port/win32ntdll.h @@ -21,9 +21,9 @@ #define FLUSH_FLAGS_FILE_DATA_SYNC_ONLY 0x4 #endif -typedef NTSTATUS (__stdcall *RtlGetLastNtStatus_t) (void); -typedef ULONG (__stdcall *RtlNtStatusToDosError_t) (NTSTATUS); -typedef NTSTATUS (__stdcall *NtFlushBuffersFileEx_t) (HANDLE, ULONG, PVOID, ULONG, PIO_STATUS_BLOCK); +typedef NTSTATUS (__stdcall * RtlGetLastNtStatus_t) (void); +typedef ULONG (__stdcall * RtlNtStatusToDosError_t) (NTSTATUS); +typedef NTSTATUS (__stdcall * NtFlushBuffersFileEx_t) (HANDLE, ULONG, PVOID, ULONG, PIO_STATUS_BLOCK); extern PGDLLIMPORT RtlGetLastNtStatus_t pg_RtlGetLastNtStatus; extern PGDLLIMPORT RtlNtStatusToDosError_t pg_RtlNtStatusToDosError; diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h index e37f5120eb..1b9db22acb 100644 --- a/src/include/replication/reorderbuffer.h +++ b/src/include/replication/reorderbuffer.h @@ -26,7 +26,7 @@ typedef enum { LOGICAL_REP_MODE_BUFFERED, LOGICAL_REP_MODE_IMMEDIATE -} LogicalRepMode; +} LogicalRepMode; /* an individual tuple, stored in one chunk of memory */ typedef struct ReorderBufferTupleBuf diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h index 6ab00daa2e..0f5fb6be00 100644 --- a/src/include/storage/bufmgr.h +++ b/src/include/storage/bufmgr.h @@ -89,7 +89,7 @@ typedef enum ExtendBufferedFlags /* internal flags follow */ EB_LOCK_TARGET = (1 << 5), -} ExtendBufferedFlags; +} ExtendBufferedFlags; /* * To identify the relation - either relation or smgr + relpersistence has to diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h index 6ae434596a..8575bea25c 100644 --- a/src/include/storage/lock.h +++ b/src/include/storage/lock.h @@ -314,7 +314,7 @@ typedef struct LOCK LOCKMASK grantMask; /* bitmask for lock types already granted */ LOCKMASK waitMask; /* bitmask for lock types awaited */ dlist_head procLocks; /* list of PROCLOCK objects assoc. with lock */ - dclist_head waitProcs; /* list of PGPROC objects waiting on lock */ + dclist_head waitProcs; /* list of PGPROC objects waiting on lock */ int requested[MAX_LOCKMODES]; /* counts of requested locks */ int nRequested; /* total of requested[] array */ int granted[MAX_LOCKMODES]; /* counts of granted locks */ diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h index d2c7afb8f4..34169e5889 100644 --- a/src/include/storage/lwlock.h +++ b/src/include/storage/lwlock.h @@ -26,10 +26,11 @@ struct PGPROC; /* what state of the wait process is a backend in */ typedef enum LWLockWaitState { - LW_WS_NOT_WAITING, /* not currently waiting / woken up */ - LW_WS_WAITING, /* currently waiting */ - LW_WS_PENDING_WAKEUP, /* removed from waitlist, but not yet signalled */ -} LWLockWaitState; + LW_WS_NOT_WAITING, /* not currently waiting / woken up */ + LW_WS_WAITING, /* currently waiting */ + LW_WS_PENDING_WAKEUP, /* removed from waitlist, but not yet + * signalled */ +} LWLockWaitState; /* * Code outside of lwlock.c should not manipulate the contents of this diff --git a/src/include/storage/predicate_internals.h b/src/include/storage/predicate_internals.h index 142a195d0e..93f84500bf 100644 --- a/src/include/storage/predicate_internals.h +++ b/src/include/storage/predicate_internals.h @@ -196,7 +196,7 @@ typedef struct RWConflictData dlist_node inLink; /* link for list of conflicts in to a sxact */ SERIALIZABLEXACT *sxactOut; SERIALIZABLEXACT *sxactIn; -} RWConflictData; +} RWConflictData; typedef struct RWConflictData *RWConflict; diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 4258cd92c9..ef74f32693 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -387,11 +387,11 @@ typedef struct PROC_HDR /* Head of list of free PGPROC structures */ dlist_head freeProcs; /* Head of list of autovacuum's free PGPROC structures */ - dlist_head autovacFreeProcs; + dlist_head autovacFreeProcs; /* Head of list of bgworker free PGPROC structures */ - dlist_head bgworkerFreeProcs; + dlist_head bgworkerFreeProcs; /* Head of list of walsender free PGPROC structures */ - dlist_head walsenderFreeProcs; + dlist_head walsenderFreeProcs; /* First pgproc waiting for group XID clear */ pg_atomic_uint32 procArrayGroupFirst; /* First pgproc waiting for group transaction status update */ diff --git a/src/include/utils/backend_status.h b/src/include/utils/backend_status.h index 9651cb1d0c..cfb26d2bcc 100644 --- a/src/include/utils/backend_status.h +++ b/src/include/utils/backend_status.h @@ -271,13 +271,13 @@ typedef struct LocalPgBackendStatus /* * Number of cached subtransactions in the current session. */ - int backend_subxact_count; + int backend_subxact_count; /* * The number of subtransactions in the current session which exceeded the * cached subtransaction limit. */ - bool backend_subxact_overflowed; + bool backend_subxact_overflowed; } LocalPgBackendStatus; diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h index 03ab598215..e2a7243542 100644 --- a/src/include/utils/pg_locale.h +++ b/src/include/utils/pg_locale.h @@ -40,7 +40,7 @@ extern PGDLLIMPORT char *locale_messages; extern PGDLLIMPORT char *locale_monetary; extern PGDLLIMPORT char *locale_numeric; extern PGDLLIMPORT char *locale_time; -extern PGDLLIMPORT int icu_validation_level; +extern PGDLLIMPORT int icu_validation_level; /* lc_time localization cache */ extern PGDLLIMPORT char *localized_abbrev_days[]; @@ -49,7 +49,7 @@ extern PGDLLIMPORT char *localized_abbrev_months[]; extern PGDLLIMPORT char *localized_full_months[]; /* is the databases's LC_CTYPE the C locale? */ -extern PGDLLIMPORT bool database_ctype_is_c; +extern PGDLLIMPORT bool database_ctype_is_c; extern bool check_locale(int category, const char *locale, char **canonname); extern char *pg_perm_setlocale(int category, const char *locale); @@ -104,9 +104,9 @@ extern bool pg_locale_deterministic(pg_locale_t locale); extern pg_locale_t pg_newlocale_from_collation(Oid collid); extern char *get_collation_actual_version(char collprovider, const char *collcollate); -extern int pg_strcoll(const char *arg1, const char *arg2, pg_locale_t locale); -extern int pg_strncoll(const char *arg1, size_t len1, - const char *arg2, size_t len2, pg_locale_t locale); +extern int pg_strcoll(const char *arg1, const char *arg2, pg_locale_t locale); +extern int pg_strncoll(const char *arg1, size_t len1, + const char *arg2, size_t len2, pg_locale_t locale); extern bool pg_strxfrm_enabled(pg_locale_t locale); extern size_t pg_strxfrm(char *dest, const char *src, size_t destsize, pg_locale_t locale); diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 31f84e90eb..1426a353cd 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -161,7 +161,7 @@ typedef struct RelationData Bitmapset *rd_keyattr; /* cols that can be ref'd by foreign keys */ Bitmapset *rd_pkattr; /* cols included in primary key */ Bitmapset *rd_idattr; /* included in replica identity index */ - Bitmapset *rd_hotblockingattr; /* cols blocking HOT update */ + Bitmapset *rd_hotblockingattr; /* cols blocking HOT update */ Bitmapset *rd_summarizedattr; /* cols indexed by summarizing indexes */ PublicationDesc *rd_pubdesc; /* publication descriptor, or NULL */ diff --git a/src/include/utils/varlena.h b/src/include/utils/varlena.h index e72ebaddbf..77f5b24735 100644 --- a/src/include/utils/varlena.h +++ b/src/include/utils/varlena.h @@ -44,7 +44,7 @@ typedef struct ClosestMatchState int min_d; int max_d; const char *match; -} ClosestMatchState; +} ClosestMatchState; extern void initClosestMatch(ClosestMatchState *state, const char *source, int max_d); extern void updateClosestMatch(ClosestMatchState *state, const char *candidate); |