diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/catalog/genbki.h | 4 | ||||
| -rw-r--r-- | src/include/catalog/pg_index.h | 10 | ||||
| -rw-r--r-- | src/include/catalog/pg_partitioned_table.h | 14 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/pg_statistic_ext.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/pg_trigger.h | 3 |
6 files changed, 21 insertions, 14 deletions
diff --git a/src/include/catalog/genbki.h b/src/include/catalog/genbki.h index 4a6c8636daf..8cac7ec8789 100644 --- a/src/include/catalog/genbki.h +++ b/src/include/catalog/genbki.h @@ -46,8 +46,8 @@ /* * Variable-length catalog fields (except possibly the first not nullable one) * should not be visible in C structures, so they are made invisible by #ifdefs - * of an undefined symbol. See also MARKNOTNULL in bootstrap.c for how this is - * handled. + * of an undefined symbol. See also the BOOTCOL_NULL_AUTO code in bootstrap.c + * for how this is handled. */ #undef CATALOG_VARLEN diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h index d3d7ea77fbb..4a642f336fa 100644 --- a/src/include/catalog/pg_index.h +++ b/src/include/catalog/pg_index.h @@ -44,12 +44,14 @@ CATALOG(pg_index,2610,IndexRelationId) BKI_SCHEMA_MACRO bool indisreplident; /* is this index the identity for replication? */ /* variable-length fields start here, but we allow direct access to indkey */ - int2vector indkey; /* column numbers of indexed cols, or 0 */ + int2vector indkey BKI_FORCE_NOT_NULL; /* column numbers of indexed cols, + * or 0 */ #ifdef CATALOG_VARLEN - oidvector indcollation; /* collation identifiers */ - oidvector indclass; /* opclass identifiers */ - int2vector indoption; /* per-column flags (AM-specific meanings) */ + oidvector indcollation BKI_FORCE_NOT_NULL; /* collation identifiers */ + oidvector indclass BKI_FORCE_NOT_NULL; /* opclass identifiers */ + int2vector indoption BKI_FORCE_NOT_NULL; /* per-column flags + * (AM-specific meanings) */ pg_node_tree indexprs; /* expression trees for index attributes that * are not simple column references; one for * each zero entry in indkey[] */ diff --git a/src/include/catalog/pg_partitioned_table.h b/src/include/catalog/pg_partitioned_table.h index a73cd0d3a44..7ee0419373c 100644 --- a/src/include/catalog/pg_partitioned_table.h +++ b/src/include/catalog/pg_partitioned_table.h @@ -41,13 +41,17 @@ CATALOG(pg_partitioned_table,3350,PartitionedRelationId) * field of a heap tuple can be reliably accessed using its C struct * offset, as previous fields are all non-nullable fixed-length fields. */ - int2vector partattrs; /* each member of the array is the attribute - * number of a partition key column, or 0 if - * the column is actually an expression */ + int2vector partattrs BKI_FORCE_NOT_NULL; /* each member of the array is + * the attribute number of a + * partition key column, or 0 + * if the column is actually + * an expression */ #ifdef CATALOG_VARLEN - oidvector partclass; /* operator class to compare keys */ - oidvector partcollation; /* user-specified collation for keys */ + oidvector partclass BKI_FORCE_NOT_NULL; /* operator class to compare + * keys */ + oidvector partcollation BKI_FORCE_NOT_NULL; /* user-specified + * collation for keys */ pg_node_tree partexprs; /* list of expressions in the partition key; * one item for each zero entry in partattrs[] */ #endif diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h index 65e8c9f0546..b50fa25dbd8 100644 --- a/src/include/catalog/pg_proc.h +++ b/src/include/catalog/pg_proc.h @@ -92,7 +92,7 @@ CATALOG(pg_proc,1255,ProcedureRelationId) BKI_BOOTSTRAP BKI_ROWTYPE_OID(81,Proce */ /* parameter types (excludes OUT params) */ - oidvector proargtypes BKI_LOOKUP(pg_type); + oidvector proargtypes BKI_LOOKUP(pg_type) BKI_FORCE_NOT_NULL; #ifdef CATALOG_VARLEN diff --git a/src/include/catalog/pg_statistic_ext.h b/src/include/catalog/pg_statistic_ext.h index a8cb16997a7..8747903fc73 100644 --- a/src/include/catalog/pg_statistic_ext.h +++ b/src/include/catalog/pg_statistic_ext.h @@ -47,7 +47,7 @@ CATALOG(pg_statistic_ext,3381,StatisticExtRelationId) * variable-length fields start here, but we allow direct access to * stxkeys */ - int2vector stxkeys; /* array of column keys */ + int2vector stxkeys BKI_FORCE_NOT_NULL; /* array of column keys */ #ifdef CATALOG_VARLEN char stxkind[1] BKI_FORCE_NOT_NULL; /* statistics kinds requested diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h index 9612b9bdd65..fa5761b7845 100644 --- a/src/include/catalog/pg_trigger.h +++ b/src/include/catalog/pg_trigger.h @@ -54,7 +54,8 @@ CATALOG(pg_trigger,2620,TriggerRelationId) * Variable-length fields start here, but we allow direct access to * tgattr. Note: tgattr and tgargs must not be null. */ - int2vector tgattr; /* column numbers, if trigger is on columns */ + int2vector tgattr BKI_FORCE_NOT_NULL; /* column numbers, if trigger is + * on columns */ #ifdef CATALOG_VARLEN bytea tgargs BKI_FORCE_NOT_NULL; /* first\000second\000tgnargs\000 */ |