diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/access/ginblock.h | 3 | ||||
-rw-r--r-- | src/include/access/ginxlog.h | 2 | ||||
-rw-r--r-- | src/include/access/heapam_xlog.h | 8 | ||||
-rw-r--r-- | src/include/access/spgist_private.h | 2 | ||||
-rw-r--r-- | src/include/access/xact.h | 4 | ||||
-rw-r--r-- | src/include/executor/nodeAgg.h | 2 | ||||
-rw-r--r-- | src/include/mb/pg_wchar.h | 2 | ||||
-rw-r--r-- | src/include/pg_config.h.win32 | 12 | ||||
-rw-r--r-- | src/include/utils/formatting.h | 2 | ||||
-rw-r--r-- | src/include/utils/jsonb.h | 2 | ||||
-rw-r--r-- | src/include/utils/relcache.h | 2 |
11 files changed, 13 insertions, 28 deletions
diff --git a/src/include/access/ginblock.h b/src/include/access/ginblock.h index 5fd397c1360..e7d49b152eb 100644 --- a/src/include/access/ginblock.h +++ b/src/include/access/ginblock.h @@ -171,9 +171,6 @@ typedef struct GinMetaPageData GinItemPointerGetBlockNumber(p) == (BlockNumber)0) #define ItemPointerSetMax(p) \ ItemPointerSet((p), InvalidBlockNumber, (OffsetNumber)0xffff) -#define ItemPointerIsMax(p) \ - (GinItemPointerGetOffsetNumber(p) == (OffsetNumber)0xffff && \ - GinItemPointerGetBlockNumber(p) == InvalidBlockNumber) #define ItemPointerSetLossyPage(p, b) \ ItemPointerSet((p), (b), (OffsetNumber)0xffff) #define ItemPointerIsLossyPage(p) \ diff --git a/src/include/access/ginxlog.h b/src/include/access/ginxlog.h index 2c5d743cace..7ef3bcf7658 100644 --- a/src/include/access/ginxlog.h +++ b/src/include/access/ginxlog.h @@ -127,7 +127,7 @@ typedef struct ginxlogSplit /* * Vacuum simply WAL-logs the whole page, when anything is modified. This - * is functionally identical to heap_newpage records, but is kept separate for + * is functionally identical to XLOG_FPI records, but is kept separate for * debugging purposes. (When inspecting the WAL stream, it's easier to see * what's going on when GIN vacuum records are marked as such, not as heap * records.) This is currently only used for entry tree leaf pages. diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h index f6cdca83eab..9629db9df4e 100644 --- a/src/include/access/heapam_xlog.h +++ b/src/include/access/heapam_xlog.h @@ -195,14 +195,14 @@ typedef struct xl_multi_insert_tuple * * Backup blk 0: new page * - * If XLOG_HEAP_PREFIX_FROM_OLD or XLOG_HEAP_SUFFIX_FROM_OLD flags are set, + * If XLH_UPDATE_PREFIX_FROM_OLD or XLH_UPDATE_SUFFIX_FROM_OLD flags are set, * the prefix and/or suffix come first, as one or two uint16s. * * After that, xl_heap_header and new tuple data follow. The new tuple * data doesn't include the prefix and suffix, which are copied from the * old tuple on replay. * - * If HEAP_CONTAINS_NEW_TUPLE_DATA flag is given, the tuple data is + * If XLH_UPDATE_CONTAINS_NEW_TUPLE flag is given, the tuple data is * included even if a full-page image was taken. * * Backup blk 1: old page, if different. (no data, just a reference to the blk) @@ -217,8 +217,8 @@ typedef struct xl_heap_update OffsetNumber new_offnum; /* new tuple's offset */ /* - * If XLOG_HEAP_CONTAINS_OLD_TUPLE or XLOG_HEAP_CONTAINS_OLD_KEY flags are - * set, a xl_heap_header struct and tuple data for the old tuple follows. + * If XLH_UPDATE_CONTAINS_OLD_TUPLE or XLH_UPDATE_CONTAINS_OLD_KEY flags + * are set, xl_heap_header and tuple data for the old tuple follow. */ } xl_heap_update; diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h index 4a389387325..e0d1178f245 100644 --- a/src/include/access/spgist_private.h +++ b/src/include/access/spgist_private.h @@ -328,7 +328,7 @@ typedef struct SpGistLeafTupleData { unsigned int tupstate:2, /* LIVE/REDIRECT/DEAD/PLACEHOLDER */ size:30; /* large enough for any palloc'able value */ - OffsetNumber nextOffset; /* next tuple in chain, or InvalidOffset */ + OffsetNumber nextOffset; /* next tuple in chain, or InvalidOffsetNumber */ ItemPointerData heapPtr; /* TID of represented heap tuple */ /* leaf datum follows */ } SpGistLeafTupleData; diff --git a/src/include/access/xact.h b/src/include/access/xact.h index a20726afa0e..d7145517047 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -283,8 +283,8 @@ typedef struct xl_xact_abort /* xl_xact_xinfo follows if XLOG_XACT_HAS_INFO */ /* xl_xact_dbinfo follows if XINFO_HAS_DBINFO */ - /* xl_xact_subxacts follows if HAS_SUBXACT */ - /* xl_xact_relfilenodes follows if HAS_RELFILENODES */ + /* xl_xact_subxacts follows if XINFO_HAS_SUBXACT */ + /* xl_xact_relfilenodes follows if XINFO_HAS_RELFILENODES */ /* No invalidation messages needed. */ /* xl_xact_twophase follows if XINFO_HAS_TWOPHASE */ /* twophase_gid follows if XINFO_HAS_GID. As a null-terminated string. */ diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h index 30541361301..1a8ca98a8c3 100644 --- a/src/include/executor/nodeAgg.h +++ b/src/include/executor/nodeAgg.h @@ -300,7 +300,7 @@ typedef struct AggStatePerHashData int numhashGrpCols; /* number of columns in hash table */ int largestGrpColIdx; /* largest col required for hashing */ AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */ - AttrNumber *hashGrpColIdxHash; /* indices in hashtbl tuples */ + AttrNumber *hashGrpColIdxHash; /* indices in hash table tuples */ Agg *aggnode; /* original Agg node, for numGroups etc. */ } AggStatePerHashData; diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h index 60c56157993..0339b98041d 100644 --- a/src/include/mb/pg_wchar.h +++ b/src/include/mb/pg_wchar.h @@ -544,7 +544,7 @@ extern int pg_mbstrlen_with_len(const char *mbstr, int len); extern int pg_mbcliplen(const char *mbstr, int len, int limit); extern int pg_encoding_mbcliplen(int encoding, const char *mbstr, int len, int limit); -extern int pg_mbcharcliplen(const char *mbstr, int len, int imit); +extern int pg_mbcharcliplen(const char *mbstr, int len, int limit); extern int pg_encoding_max_length(int encoding); extern int pg_database_encoding_max_length(void); extern mbcharacter_incrementer pg_database_encoding_character_incrementer(void); diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 8e35cf0a037..2d903c82b80 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -159,15 +159,9 @@ /* Define to 1 if you have the <editline/readline.h> header file. */ /* #undef HAVE_EDITLINE_READLINE_H */ -/* Define to 1 if you have the `fcvt' function. */ -#define HAVE_FCVT 1 - /* Define to 1 if you have the `fdatasync' function. */ /* #undef HAVE_FDATASYNC */ -/* Define to 1 if you have finite(). */ -#define HAVE_FINITE 1 - /* Define to 1 if you have the `fpclass' function. */ /* #undef HAVE_FPCLASS */ @@ -469,9 +463,6 @@ /* Define to 1 if `__ss_len' is member of `struct sockaddr_storage'. */ /* #undef HAVE_STRUCT_SOCKADDR_STORAGE___SS_LEN */ -/* Define to 1 if the system has the type `struct sockaddr_un'. */ -/* #undef HAVE_STRUCT_SOCKADDR_UN */ - /* Define to 1 if `tm_zone' is member of `struct tm'. */ /* #undef HAVE_STRUCT_TM_TM_ZONE */ @@ -481,9 +472,6 @@ /* Define to 1 if you have the `sync_file_range' function. */ /* #undef HAVE_SYNC_FILE_RANGE */ -/* Define to 1 if you have the `sysconf' function. */ -/* #undef HAVE_SYSCONF */ - /* Define to 1 if you have the syslog interface. */ /* #undef HAVE_SYSLOG */ diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h index 5b275dc9850..741c5f4809f 100644 --- a/src/include/utils/formatting.h +++ b/src/include/utils/formatting.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1999-2019, PostgreSQL Global Development Group * * The PostgreSQL routines for a DateTime/int/float/numeric formatting, - * inspire with Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines. + * inspired by the Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines. * * Karel Zak * diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h index 2fe7d32fec2..ac52b75f51d 100644 --- a/src/include/utils/jsonb.h +++ b/src/include/utils/jsonb.h @@ -367,7 +367,7 @@ extern JsonbValue *findJsonbValueFromContainer(JsonbContainer *sheader, extern JsonbValue *getIthJsonbValueFromContainer(JsonbContainer *sheader, uint32 i); extern JsonbValue *pushJsonbValue(JsonbParseState **pstate, - JsonbIteratorToken seq, JsonbValue *jbVal); + JsonbIteratorToken seq, JsonbValue *jbval); extern JsonbIterator *JsonbIteratorInit(JsonbContainer *container); extern JsonbIteratorToken JsonbIteratorNext(JsonbIterator **it, JsonbValue *val, bool skipNested); diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h index d9c10ffcbaf..2f2ace35b05 100644 --- a/src/include/utils/relcache.h +++ b/src/include/utils/relcache.h @@ -59,7 +59,7 @@ typedef enum IndexAttrBitmapKind } IndexAttrBitmapKind; extern Bitmapset *RelationGetIndexAttrBitmap(Relation relation, - IndexAttrBitmapKind keyAttrs); + IndexAttrBitmapKind attrKind); extern void RelationGetExclusionInfo(Relation indexRelation, Oid **operators, |