From a43dd20557d9f137ab412279694e2e6aee45ef15 Mon Sep 17 00:00:00 2001 From: John Naylor Date: Thu, 14 Dec 2017 12:06:21 +0700 Subject: [PATCH 03/10] Remove hard-coded schema knowledge about pg_attribute from genbki.pl Label a column's default value in the catalog header. Add a new function to Catalog.pm to fill in a tuple with default values. It will complain loudly if it can't find either a default or a given value, so change the signature of emit_pgattr_row() so we can pass a partially built tuple to it. Format schema macro entries according to their types. Commit 8137f2c32322c624e0431fac1621e8e9315202f9 labeled variable length columns. Expose that label so we can exclude those columns from schema macros in a general fashion. This means slightly less code maintenance, but more importantly it's a proving ground for mechanisms used in later commits. --- src/backend/catalog/Catalog.pm | 49 +++++++++++- src/backend/catalog/genbki.pl | 158 ++++++++++++++++++------------------- src/include/catalog/genbki.h | 3 + src/include/catalog/pg_attribute.h | 22 +++--- 4 files changed, 140 insertions(+), 92 deletions(-) diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm index 6bc14d2..246aa36 100644 --- a/src/backend/catalog/Catalog.pm +++ b/src/backend/catalog/Catalog.pm @@ -44,6 +44,7 @@ sub Catalogs my %catalog; $catalog{columns} = []; $catalog{data} = []; + my $is_varlen = 0; open(my $ifh, '<', $input_file) || die "$input_file: $!"; @@ -169,7 +170,14 @@ sub Catalogs elsif ($declaring_attributes) { next if (/^{|^$/); - next if (/^#/); + if (/^#/) + { + if (/^#ifdef\s+CATALOG_VARLEN/) + { + $is_varlen = 1; + } + next; + } if (/^}/) { undef $declaring_attributes; @@ -177,6 +185,10 @@ sub Catalogs else { my %column; + if ($is_varlen) + { + $column{is_varlen} = 1; + } my ($atttype, $attname, $attopt) = split /\s+/, $_; die "parse error ($input_file)" unless $attname; if (exists $RENAME_ATTTYPE{$atttype}) @@ -186,7 +198,7 @@ sub Catalogs if ($attname =~ /(.*)\[.*\]/) # array attribute { $attname = $1; - $atttype .= '[]'; # variable-length only + $atttype .= '[]'; } $column{type} = $atttype; @@ -202,6 +214,10 @@ sub Catalogs { $column{forcenotnull} = 1; } + elsif ($attopt =~ /BKI_DEFAULT\((\S+)\)/) + { + $column{default} = $1; + } else { die @@ -240,6 +256,35 @@ sub SplitDataLine return @result; } +# Fill in default values of a record using the given schema. It's the +# caller's responsibility to specify other values beforehand. +sub AddDefaultValues +{ + my ($row, $schema, $catname) = @_; + + die "Schema undefined for $catname\n" + if !defined $schema; + + foreach my $column (@$schema) + { + my $attname = $column->{name}; + my $atttype = $column->{type}; + + if (defined $row->{$attname}) + { + ; + } + elsif (defined $column->{default}) + { + $row->{$attname} = $column->{default}; + } + else + { + die "Unspecified value in $catname.$attname\n"; + } + } +} + # Rename temporary files to final names. # Call this function with the final file name and the .tmp extension # Note: recommended extension is ".tmp$$", so that parallel make steps diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl index 4bd614f..1876399 100644 --- a/src/backend/catalog/genbki.pl +++ b/src/backend/catalog/genbki.pl @@ -119,7 +119,6 @@ foreach my $catname (@{ $catalogs->{names} }) . $catalog->{without_oids} . $catalog->{rowtype_oid} . "\n"; - my %bki_attr; my @attnames; my $first = 1; @@ -129,7 +128,6 @@ foreach my $catname (@{ $catalogs->{names} }) { my $attname = $column->{name}; my $atttype = $column->{type}; - $bki_attr{$attname} = $column; push @attnames, $attname; if (!$first) @@ -257,25 +255,25 @@ foreach my $catname (@{ $catalogs->{names} }) foreach my $attr (@user_attrs) { $attnum++; - my $row = emit_pgattr_row($table_name, $attr, $priornotnull); - $row->{attnum} = $attnum; - $row->{attstattarget} = '-1'; - $priornotnull &= ($row->{attnotnull} eq 't'); + my %row; + $row{attnum} = $attnum; + $row{attrelid} = $table->{relation_oid}; + + emit_pgattr_row(\%row, $attr, $priornotnull, $schema); + $priornotnull &= ($row{attnotnull} eq 't'); # If it's bootstrapped, put an entry in postgres.bki. if ($table->{bootstrap}) { - bki_insert($row, @attnames); + bki_insert(\%row, @attnames); } # Store schemapg entries for later. - $row = - emit_schemapg_row($row, - grep { $bki_attr{$_}{type} eq 'bool' } @attnames); - push @{ $schemapg_entries{$table_name} }, '{ ' - . join( - ', ', grep { defined $_ } - map $row->{$_}, @attnames) . ' }'; + emit_schemapg_row(\%row, $schema); + push @{ $schemapg_entries{$table_name} }, + '{ ' + . join(', ', grep { defined $_ } @row{@attnames}) + . ' }'; } # Generate entries for system attributes. @@ -294,16 +292,19 @@ foreach my $catname (@{ $catalogs->{names} }) foreach my $attr (@SYS_ATTRS) { $attnum--; - my $row = emit_pgattr_row($table_name, $attr, 1); - $row->{attnum} = $attnum; - $row->{attstattarget} = '0'; + my %row; + $row{attnum} = $attnum; + $row{attrelid} = $table->{relation_oid}; + $row{attstattarget} = '0'; + + emit_pgattr_row(\%row, $attr, 1, $schema); # some catalogs don't have oids next if $table->{without_oids} - && $row->{attname} eq 'oid'; + && $row{attname} eq 'oid'; - bki_insert($row, @attnames); + bki_insert(\%row, @attnames); } } } @@ -380,19 +381,17 @@ exit 0; #################### Subroutines ######################## -# Given a system catalog name and a reference to a key-value pair corresponding -# to the name and type of a column, generate a reference to a hash that -# represents a pg_attribute entry. We must also be told whether preceding +# Given the schema of pg_attribute, generate an entry for it using information +# about the attribute it describes. Any value that is not handled here +# must be supplied by the caller. We must also be told whether preceding # columns were all not-null. sub emit_pgattr_row { - my ($table_name, $attr, $priornotnull) = @_; + my ($row, $attr, $priornotnull, $pgattr_schema) = @_; my $attname = $attr->{name}; my $atttype = $attr->{type}; - my %row; - $row{attrelid} = $catalogs->{$table_name}->{relation_oid}; - $row{attname} = $attname; + $row->{attname} = $attname; # Adjust type name for arrays: foo[] becomes _foo # so we can look it up in pg_type @@ -406,23 +405,23 @@ sub emit_pgattr_row { if (defined $type->{typname} && $type->{typname} eq $atttype) { - $row{atttypid} = $type->{oid}; - $row{attlen} = $type->{typlen}; - $row{attbyval} = $type->{typbyval}; - $row{attstorage} = $type->{typstorage}; - $row{attalign} = $type->{typalign}; + $row->{atttypid} = $type->{oid}; + $row->{attlen} = $type->{typlen}; + $row->{attbyval} = $type->{typbyval}; + $row->{attstorage} = $type->{typstorage}; + $row->{attalign} = $type->{typalign}; # set attndims if it's an array type - $row{attndims} = $type->{typcategory} eq 'A' ? '1' : '0'; - $row{attcollation} = $type->{typcollation}; + $row->{attndims} = $type->{typcategory} eq 'A' ? '1' : '0'; + $row->{attcollation} = $type->{typcollation}; if (defined $attr->{forcenotnull}) { - $row{attnotnull} = 't'; + $row->{attnotnull} = 't'; } elsif (defined $attr->{forcenull}) { - $row{attnotnull} = 'f'; + $row->{attnotnull} = 'f'; } elsif ($priornotnull) { @@ -431,7 +430,7 @@ sub emit_pgattr_row # fixed-width and prior columns are all NOT NULL --- # compare DefineAttr in bootstrap.c. oidvector and # int2vector are also treated as not-nullable. - $row{attnotnull} = + $row->{attnotnull} = $type->{typname} eq 'oidvector' ? 't' : $type->{typname} eq 'int2vector' ? 't' : $type->{typlen} eq 'NAMEDATALEN' ? 't' @@ -440,25 +439,12 @@ sub emit_pgattr_row } else { - $row{attnotnull} = 'f'; + $row->{attnotnull} = 'f'; } last; } } - - # Add in default values for pg_attribute - my %PGATTR_DEFAULTS = ( - attcacheoff => '-1', - atttypmod => '-1', - atthasdef => 'f', - attidentity => '', - attisdropped => 'f', - attislocal => 't', - attinhcount => '0', - attacl => '_null_', - attoptions => '_null_', - attfdwoptions => '_null_'); - return { %PGATTR_DEFAULTS, %row }; + Catalog::AddDefaultValues($row, $pgattr_schema, 'pg_attribute'); } # Write a pg_attribute entry to postgres.bki @@ -467,8 +453,7 @@ sub bki_insert my $row = shift; my @attnames = @_; my $oid = $row->{oid} ? "OID = $row->{oid} " : ''; - my $bki_values = join ' ', map { $_ eq '' ? '""' : $_ } map $row->{$_}, - @attnames; + my $bki_values = join ' ', map $row->{$_}, @attnames; printf $bki "insert %s( %s )\n", $oid, $bki_values; } @@ -476,34 +461,49 @@ sub bki_insert # quite identical, to the corresponding values in postgres.bki. sub emit_schemapg_row { - my $row = shift; - my @bool_attrs = @_; - - # Replace empty string by zero char constant - $row->{attidentity} ||= '\0'; - - # Supply appropriate quoting for these fields. - $row->{attname} = q|{"| . $row->{attname} . q|"}|; - $row->{attstorage} = q|'| . $row->{attstorage} . q|'|; - $row->{attalign} = q|'| . $row->{attalign} . q|'|; - $row->{attidentity} = q|'| . $row->{attidentity} . q|'|; - - # We don't emit initializers for the variable length fields at all. - # Only the fixed-size portions of the descriptors are ever used. - delete $row->{attacl}; - delete $row->{attoptions}; - delete $row->{attfdwoptions}; - - # Expand booleans from 'f'/'t' to 'false'/'true'. - # Some values might be other macros (eg FLOAT4PASSBYVAL), don't change. - foreach my $attr (@bool_attrs) + my $row = shift; + my $pgattr_schema = shift; + + foreach my $column (@$pgattr_schema) { - $row->{$attr} = - $row->{$attr} eq 't' ? 'true' - : $row->{$attr} eq 'f' ? 'false' - : $row->{$attr}; + my $pgattr_name = $column->{name}; + my $pgattr_type = $column->{type}; + + # Supply appropriate quoting for these fields. + if ($pgattr_type eq 'name') + { + $row->{$pgattr_name} = q|{"| . $row->{$pgattr_name} . q|"}|; + } + elsif ($pgattr_type eq 'char') + { + + # Replace empty string by zero char constant + if ($row->{$pgattr_name} eq q|""|) + { + $row->{$pgattr_name} = '\0'; + } + + $row->{$pgattr_name} = q|'| . $row->{$pgattr_name} . q|'|; + } + + # Expand booleans from 'f'/'t' to 'false'/'true'. + # Some values might be other macros (eg FLOAT4PASSBYVAL), + # don't change. + elsif ($pgattr_type eq 'bool') + { + $row->{$pgattr_name} = + $row->{$pgattr_name} eq 't' ? 'true' + : $row->{$pgattr_name} eq 'f' ? 'false' + : $row->{$pgattr_name}; + } + + # We don't emit initializers for the variable length fields at all. + # Only the fixed-size portions of the descriptors are ever used. + if ($column->{is_varlen}) + { + delete $row->{$pgattr_name}; + } } - return $row; } sub usage diff --git a/src/include/catalog/genbki.h b/src/include/catalog/genbki.h index a2cb313..71fc579 100644 --- a/src/include/catalog/genbki.h +++ b/src/include/catalog/genbki.h @@ -31,6 +31,9 @@ #define BKI_FORCE_NULL #define BKI_FORCE_NOT_NULL +/* Specifies a default value for a catalog field */ +#define BKI_DEFAULT(value) + /* * This is never defined; it's here only for documentation. * diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h index bcf28e8..5436a90 100644 --- a/src/include/catalog/pg_attribute.h +++ b/src/include/catalog/pg_attribute.h @@ -54,7 +54,7 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK * that no value has been explicitly set for this column, so ANALYZE * should use the default setting. */ - int32 attstattarget; + int32 attstattarget BKI_DEFAULT(-1); /* * attlen is a copy of the typlen field from pg_type for this attribute. @@ -90,7 +90,7 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK * descriptor, we may then update attcacheoff in the copies. This speeds * up the attribute walking process. */ - int32 attcacheoff; + int32 attcacheoff BKI_DEFAULT(-1); /* * atttypmod records type-specific data supplied at table creation time @@ -98,7 +98,7 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK * type-specific input and output functions as the third argument. The * value will generally be -1 for types that do not need typmod. */ - int32 atttypmod; + int32 atttypmod BKI_DEFAULT(-1); /* * attbyval is a copy of the typbyval field from pg_type for this @@ -131,13 +131,13 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK bool attnotnull; /* Has DEFAULT value or not */ - bool atthasdef; + bool atthasdef BKI_DEFAULT(f); /* One of the ATTRIBUTE_IDENTITY_* constants below, or '\0' */ - char attidentity; + char attidentity BKI_DEFAULT(""); /* Is dropped (ie, logically invisible) or not */ - bool attisdropped; + bool attisdropped BKI_DEFAULT(f); /* * This flag specifies whether this column has ever had a local @@ -148,10 +148,10 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK * not dropped by a parent's DROP COLUMN even if this causes the column's * attinhcount to become zero. */ - bool attislocal; + bool attislocal BKI_DEFAULT(t); /* Number of times inherited from direct parent relation(s) */ - int32 attinhcount; + int32 attinhcount BKI_DEFAULT(0); /* attribute's collation */ Oid attcollation; @@ -160,13 +160,13 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK /* NOTE: The following fields are not present in tuple descriptors. */ /* Column-level access permissions */ - aclitem attacl[1]; + aclitem attacl[1] BKI_DEFAULT(_null_); /* Column-level options */ - text attoptions[1]; + text attoptions[1] BKI_DEFAULT(_null_); /* Column-level FDW options */ - text attfdwoptions[1]; + text attfdwoptions[1] BKI_DEFAULT(_null_); #endif } FormData_pg_attribute; -- 2.7.4