diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/access/brin_revmap.h | 2 | ||||
-rw-r--r-- | src/include/access/hash_xlog.h | 13 | ||||
-rw-r--r-- | src/include/access/reloptions.h | 2 | ||||
-rw-r--r-- | src/include/access/xlogreader.h | 2 | ||||
-rw-r--r-- | src/include/catalog/namespace.h | 2 | ||||
-rw-r--r-- | src/include/nodes/nodes.h | 4 | ||||
-rw-r--r-- | src/include/port/win32_port.h | 2 | ||||
-rw-r--r-- | src/include/rewrite/prs2lock.h | 2 | ||||
-rw-r--r-- | src/include/storage/standbydefs.h | 2 | ||||
-rw-r--r-- | src/include/utils/elog.h | 2 | ||||
-rw-r--r-- | src/include/utils/guc.h | 2 | ||||
-rw-r--r-- | src/include/utils/rel.h | 2 | ||||
-rw-r--r-- | src/include/utils/selfuncs.h | 2 |
13 files changed, 13 insertions, 26 deletions
diff --git a/src/include/access/brin_revmap.h b/src/include/access/brin_revmap.h index 2ade88bc1e5..4351dcca1f8 100644 --- a/src/include/access/brin_revmap.h +++ b/src/include/access/brin_revmap.h @@ -31,7 +31,7 @@ extern void brinRevmapExtend(BrinRevmap *revmap, BlockNumber heapBlk); extern Buffer brinLockRevmapPageForUpdate(BrinRevmap *revmap, BlockNumber heapBlk); -extern void brinSetHeapBlockItemptr(Buffer rmbuf, BlockNumber pagesPerRange, +extern void brinSetHeapBlockItemptr(Buffer buf, BlockNumber pagesPerRange, BlockNumber heapBlk, ItemPointerData tid); extern BrinTuple *brinGetTupleForHeapBlock(BrinRevmap *revmap, BlockNumber heapBlk, Buffer *buf, OffsetNumber *off, diff --git a/src/include/access/hash_xlog.h b/src/include/access/hash_xlog.h index 53b682c56ef..7d52145a2a7 100644 --- a/src/include/access/hash_xlog.h +++ b/src/include/access/hash_xlog.h @@ -52,19 +52,6 @@ #define XLH_SPLIT_META_UPDATE_SPLITPOINT (1<<1) /* - * This is what we need to know about a HASH index create. - * - * Backup block 0: metapage - */ -typedef struct xl_hash_createidx -{ - double num_tuples; - RegProcedure procid; - uint16 ffactor; -} xl_hash_createidx; -#define SizeOfHashCreateIdx (offsetof(xl_hash_createidx, ffactor) + sizeof(uint16)) - -/* * This is what we need to know about simple (without split) insert. * * This data record is used for XLOG_HASH_INSERT diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h index a1912f41e63..6d392e4d5a4 100644 --- a/src/include/access/reloptions.h +++ b/src/include/access/reloptions.h @@ -237,7 +237,7 @@ typedef struct /* * For use by code reading options already parsed: get a pointer to the string - * value itself. "optstruct" is the StdRdOption struct or equivalent, "member" + * value itself. "optstruct" is the StdRdOptions struct or equivalent, "member" * is the struct member corresponding to the string option */ #define GET_STRING_RELOPTION(optstruct, member) \ diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h index a12c94cba67..aa9bc637259 100644 --- a/src/include/access/xlogreader.h +++ b/src/include/access/xlogreader.h @@ -248,7 +248,7 @@ extern bool DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, extern FullTransactionId XLogRecGetFullXid(XLogReaderState *record); #endif -extern bool RestoreBlockImage(XLogReaderState *recoder, uint8 block_id, char *dst); +extern bool RestoreBlockImage(XLogReaderState *record, uint8 block_id, char *page); extern char *XLogRecGetBlockData(XLogReaderState *record, uint8 block_id, Size *len); extern bool XLogRecGetBlockTag(XLogReaderState *record, uint8 block_id, RelFileNode *rnode, ForkNumber *forknum, diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index 187d76de18a..edb98842fcf 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -105,7 +105,7 @@ extern Oid ConversionGetConid(const char *conname); extern bool ConversionIsVisible(Oid conid); extern Oid get_statistics_object_oid(List *names, bool missing_ok); -extern bool StatisticsObjIsVisible(Oid stxid); +extern bool StatisticsObjIsVisible(Oid relid); extern Oid get_ts_parser_oid(List *names, bool missing_ok); extern bool TSParserIsVisible(Oid prsId); diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h index 4e2fb39105b..3cbb08df92a 100644 --- a/src/include/nodes/nodes.h +++ b/src/include/nodes/nodes.h @@ -768,8 +768,8 @@ typedef enum AggStrategy /* Primitive options supported by nodeAgg.c: */ #define AGGSPLITOP_COMBINE 0x01 /* substitute combinefn for transfn */ #define AGGSPLITOP_SKIPFINAL 0x02 /* skip finalfn, return state as-is */ -#define AGGSPLITOP_SERIALIZE 0x04 /* apply serializefn to output */ -#define AGGSPLITOP_DESERIALIZE 0x08 /* apply deserializefn to input */ +#define AGGSPLITOP_SERIALIZE 0x04 /* apply serialfn to output */ +#define AGGSPLITOP_DESERIALIZE 0x08 /* apply deserialfn to input */ /* Supported operating modes (i.e., useful combinations of these options): */ typedef enum AggSplit diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h index f4841fb3975..1cf166a570d 100644 --- a/src/include/port/win32_port.h +++ b/src/include/port/win32_port.h @@ -451,7 +451,7 @@ int pgwin32_bind(SOCKET s, struct sockaddr *addr, int addrlen); int pgwin32_listen(SOCKET s, int backlog); SOCKET pgwin32_accept(SOCKET s, struct sockaddr *addr, int *addrlen); int pgwin32_connect(SOCKET s, const struct sockaddr *name, int namelen); -int pgwin32_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout); +int pgwin32_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout); int pgwin32_recv(SOCKET s, char *buf, int len, int flags); int pgwin32_send(SOCKET s, const void *buf, int len, int flags); int pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout); diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h index 62e756ff638..07ca649359f 100644 --- a/src/include/rewrite/prs2lock.h +++ b/src/include/rewrite/prs2lock.h @@ -43,4 +43,4 @@ typedef struct RuleLock RewriteRule **rules; } RuleLock; -#endif /* REWRITE_H */ +#endif /* PRS2LOCK_H */ diff --git a/src/include/storage/standbydefs.h b/src/include/storage/standbydefs.h index befdbf60bf8..9a612a5834b 100644 --- a/src/include/storage/standbydefs.h +++ b/src/include/storage/standbydefs.h @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------- * - * standbydef.h + * standbydefs.h * Frontend exposed definitions for hot standby mode. * * diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index dbfd8efd269..ba0b7f6f79c 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -63,7 +63,7 @@ (PGSIXBIT(ch1) + (PGSIXBIT(ch2) << 6) + (PGSIXBIT(ch3) << 12) + \ (PGSIXBIT(ch4) << 18) + (PGSIXBIT(ch5) << 24)) -/* These macros depend on the fact that '0' becomes a zero in SIXBIT */ +/* These macros depend on the fact that '0' becomes a zero in PGSIXBIT */ #define ERRCODE_TO_CATEGORY(ec) ((ec) & ((1 << 12) - 1)) #define ERRCODE_IS_CATEGORY(ec) (((ec) & ~((1 << 12) - 1)) == 0) diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h index a93ed77c9c3..6791e0cbc20 100644 --- a/src/include/utils/guc.h +++ b/src/include/utils/guc.h @@ -365,7 +365,7 @@ extern int set_config_option(const char *name, const char *value, GucContext context, GucSource source, GucAction action, bool changeVal, int elevel, bool is_reload); -extern void AlterSystemSetConfigFile(AlterSystemStmt *setstmt); +extern void AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt); extern char *GetConfigOptionByName(const char *name, const char **varname, bool missing_ok); extern void GetConfigOptionByNum(int varnum, const char **values, bool *noshow); diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index b0fe19ebc54..2174bbafd14 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -75,7 +75,7 @@ typedef struct RelationData * when a relation has multiple new relfilenodes within a single * transaction, with one of them occurring in a subsequently aborted * subtransaction, e.g. BEGIN; TRUNCATE t; SAVEPOINT save; TRUNCATE t; - * ROLLBACK TO save; -- rd_newRelfilenode is now forgotten + * ROLLBACK TO save; -- rd_newRelfilenodeSubid is now forgotten */ SubTransactionId rd_createSubid; /* rel was created in current xact */ SubTransactionId rd_newRelfilenodeSubid; /* new relfilenode assigned in diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h index 85d9ecbfc6e..9554952a8a1 100644 --- a/src/include/utils/selfuncs.h +++ b/src/include/utils/selfuncs.h @@ -109,7 +109,7 @@ typedef struct double numIndexPages; /* number of leaf pages visited */ double numIndexTuples; /* number of leaf tuples visited */ double spc_random_page_cost; /* relevant random_page_cost value */ - double num_sa_scans; /* # indexscans from ScalarArrayOps */ + double num_sa_scans; /* # indexscans from ScalarArrayOpExprs */ } GenericCosts; /* Hooks for plugins to get control when we ask for stats */ |