mirror of
https://github.com/postgres/postgres.git
synced 2025-07-03 20:02:46 +03:00
Remove WITH OIDS support, change oid catalog column visibility.
Previously tables declared WITH OIDS, including a significant fraction of the catalog tables, stored the oid column not as a normal column, but as part of the tuple header. This special column was not shown by default, which was somewhat odd, as it's often (consider e.g. pg_class.oid) one of the more important parts of a row. Neither pg_dump nor COPY included the contents of the oid column by default. The fact that the oid column was not an ordinary column necessitated a significant amount of special case code to support oid columns. That already was painful for the existing, but upcoming work aiming to make table storage pluggable, would have required expanding and duplicating that "specialness" significantly. WITH OIDS has been deprecated since 2005 (commit ff02d0a05280e0). Remove it. Removing includes: - CREATE TABLE and ALTER TABLE syntax for declaring the table to be WITH OIDS has been removed (WITH (oids[ = true]) will error out) - pg_dump does not support dumping tables declared WITH OIDS and will issue a warning when dumping one (and ignore the oid column). - restoring an pg_dump archive with pg_restore will warn when restoring a table with oid contents (and ignore the oid column) - COPY will refuse to load binary dump that includes oids. - pg_upgrade will error out when encountering tables declared WITH OIDS, they have to be altered to remove the oid column first. - Functionality to access the oid of the last inserted row (like plpgsql's RESULT_OID, spi's SPI_lastoid, ...) has been removed. The syntax for declaring a table WITHOUT OIDS (or WITH (oids = false) for CREATE TABLE) is still supported. While that requires a bit of support code, it seems unnecessary to break applications / dumps that do not use oids, and are explicit about not using them. The biggest user of WITH OID columns was postgres' catalog. This commit changes all 'magic' oid columns to be columns that are normally declared and stored. To reduce unnecessary query breakage all the newly added columns are still named 'oid', even if a table's column naming scheme would indicate 'reloid' or such. This obviously requires adapting a lot code, mostly replacing oid access via HeapTupleGetOid() with access to the underlying Form_pg_*->oid column. The bootstrap process now assigns oids for all oid columns in genbki.pl that do not have an explicit value (starting at the largest oid previously used), only oids assigned later by oids will be above FirstBootstrapObjectId. As the oid column now is a normal column the special bootstrap syntax for oids has been removed. Oids are not automatically assigned during insertion anymore, all backend code explicitly assigns oids with GetNewOidWithIndex(). For the rare case that insertions into the catalog via SQL are called for the new pg_nextoid() function can be used (which only works on catalog tables). The fact that oid columns on system tables are now normal columns means that they will be included in the set of columns expanded by * (i.e. SELECT * FROM pg_class will now include the table's oid, previously it did not). It'd not technically be hard to hide oid column by default, but that'd mean confusing behavior would either have to be carried forward forever, or it'd cause breakage down the line. While it's not unlikely that further adjustments are needed, the scope/invasiveness of the patch makes it worthwhile to get merge this now. It's painful to maintain externally, too complicated to commit after the code code freeze, and a dependency of a number of other patches. Catversion bump, for obvious reasons. Author: Andres Freund, with contributions by John Naylor Discussion: https://postgr.es/m/20180930034810.ywp2c7awz7opzcfr@alap3.anarazel.de
This commit is contained in:
@ -113,8 +113,8 @@ static int num_columns_read = 0;
|
||||
%type <list> boot_index_params
|
||||
%type <ielem> boot_index_param
|
||||
%type <str> boot_ident
|
||||
%type <ival> optbootstrap optsharedrelation optwithoutoids boot_column_nullness
|
||||
%type <oidval> oidspec optoideq optrowtypeoid
|
||||
%type <ival> optbootstrap optsharedrelation boot_column_nullness
|
||||
%type <oidval> oidspec optrowtypeoid
|
||||
|
||||
%token <str> ID
|
||||
%token COMMA EQUALS LPAREN RPAREN
|
||||
@ -123,7 +123,7 @@ static int num_columns_read = 0;
|
||||
/* All the rest are unreserved, and should be handled in boot_ident! */
|
||||
%token <kw> OPEN XCLOSE XCREATE INSERT_TUPLE
|
||||
%token <kw> XDECLARE INDEX ON USING XBUILD INDICES UNIQUE XTOAST
|
||||
%token <kw> OBJ_ID XBOOTSTRAP XSHARED_RELATION XWITHOUT_OIDS XROWTYPE_OID
|
||||
%token <kw> OBJ_ID XBOOTSTRAP XSHARED_RELATION XROWTYPE_OID
|
||||
%token <kw> XFORCE XNOT XNULL
|
||||
|
||||
%start TopLevel
|
||||
@ -170,7 +170,7 @@ Boot_CloseStmt:
|
||||
;
|
||||
|
||||
Boot_CreateStmt:
|
||||
XCREATE boot_ident oidspec optbootstrap optsharedrelation optwithoutoids optrowtypeoid LPAREN
|
||||
XCREATE boot_ident oidspec optbootstrap optsharedrelation optrowtypeoid LPAREN
|
||||
{
|
||||
do_start();
|
||||
numattr = 0;
|
||||
@ -192,7 +192,7 @@ Boot_CreateStmt:
|
||||
|
||||
do_start();
|
||||
|
||||
tupdesc = CreateTupleDesc(numattr, !($6), attrtypes);
|
||||
tupdesc = CreateTupleDesc(numattr, attrtypes);
|
||||
|
||||
shared_relation = $5;
|
||||
|
||||
@ -236,7 +236,7 @@ Boot_CreateStmt:
|
||||
PG_CATALOG_NAMESPACE,
|
||||
shared_relation ? GLOBALTABLESPACE_OID : 0,
|
||||
$3,
|
||||
$7,
|
||||
$6,
|
||||
InvalidOid,
|
||||
BOOTSTRAP_SUPERUSERID,
|
||||
tupdesc,
|
||||
@ -245,8 +245,6 @@ Boot_CreateStmt:
|
||||
RELPERSISTENCE_PERMANENT,
|
||||
shared_relation,
|
||||
mapped_relation,
|
||||
true,
|
||||
0,
|
||||
ONCOMMIT_NOOP,
|
||||
(Datum) 0,
|
||||
false,
|
||||
@ -261,13 +259,10 @@ Boot_CreateStmt:
|
||||
;
|
||||
|
||||
Boot_InsertStmt:
|
||||
INSERT_TUPLE optoideq
|
||||
INSERT_TUPLE
|
||||
{
|
||||
do_start();
|
||||
if ($2)
|
||||
elog(DEBUG4, "inserting row with oid %u", $2);
|
||||
else
|
||||
elog(DEBUG4, "inserting row");
|
||||
elog(DEBUG4, "inserting row");
|
||||
num_columns_read = 0;
|
||||
}
|
||||
LPAREN boot_column_val_list RPAREN
|
||||
@ -277,7 +272,7 @@ Boot_InsertStmt:
|
||||
numattr, num_columns_read);
|
||||
if (boot_reldesc == NULL)
|
||||
elog(FATAL, "relation not open");
|
||||
InsertOneTuple($2);
|
||||
InsertOneTuple();
|
||||
do_end();
|
||||
}
|
||||
;
|
||||
@ -432,11 +427,6 @@ optsharedrelation:
|
||||
| { $$ = 0; }
|
||||
;
|
||||
|
||||
optwithoutoids:
|
||||
XWITHOUT_OIDS { $$ = 1; }
|
||||
| { $$ = 0; }
|
||||
;
|
||||
|
||||
optrowtypeoid:
|
||||
XROWTYPE_OID oidspec { $$ = $2; }
|
||||
| { $$ = InvalidOid; }
|
||||
@ -466,11 +456,6 @@ oidspec:
|
||||
boot_ident { $$ = atooid($1); }
|
||||
;
|
||||
|
||||
optoideq:
|
||||
OBJ_ID EQUALS oidspec { $$ = $3; }
|
||||
| { $$ = InvalidOid; }
|
||||
;
|
||||
|
||||
boot_column_val_list:
|
||||
boot_column_val
|
||||
| boot_column_val_list boot_column_val
|
||||
@ -501,7 +486,6 @@ boot_ident:
|
||||
| OBJ_ID { $$ = pstrdup($1); }
|
||||
| XBOOTSTRAP { $$ = pstrdup($1); }
|
||||
| XSHARED_RELATION { $$ = pstrdup($1); }
|
||||
| XWITHOUT_OIDS { $$ = pstrdup($1); }
|
||||
| XROWTYPE_OID { $$ = pstrdup($1); }
|
||||
| XFORCE { $$ = pstrdup($1); }
|
||||
| XNOT { $$ = pstrdup($1); }
|
||||
|
@ -91,7 +91,6 @@ create { yylval.kw = "create"; return XCREATE; }
|
||||
OID { yylval.kw = "OID"; return OBJ_ID; }
|
||||
bootstrap { yylval.kw = "bootstrap"; return XBOOTSTRAP; }
|
||||
shared_relation { yylval.kw = "shared_relation"; return XSHARED_RELATION; }
|
||||
without_oids { yylval.kw = "without_oids"; return XWITHOUT_OIDS; }
|
||||
rowtype_oid { yylval.kw = "rowtype_oid"; return XROWTYPE_OID; }
|
||||
|
||||
insert { yylval.kw = "insert"; return INSERT_TUPLE; }
|
||||
|
@ -616,7 +616,7 @@ boot_openrel(char *relname)
|
||||
app = Typ;
|
||||
while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)
|
||||
{
|
||||
(*app)->am_oid = HeapTupleGetOid(tup);
|
||||
(*app)->am_oid = ((Form_pg_type) GETSTRUCT(tup))->oid;
|
||||
memcpy((char *) &(*app)->am_typ,
|
||||
(char *) GETSTRUCT(tup),
|
||||
sizeof((*app)->am_typ));
|
||||
@ -799,20 +799,16 @@ DefineAttr(char *name, char *type, int attnum, int nullness)
|
||||
* ----------------
|
||||
*/
|
||||
void
|
||||
InsertOneTuple(Oid objectid)
|
||||
InsertOneTuple(void)
|
||||
{
|
||||
HeapTuple tuple;
|
||||
TupleDesc tupDesc;
|
||||
int i;
|
||||
|
||||
elog(DEBUG4, "inserting row oid %u, %d columns", objectid, numattr);
|
||||
elog(DEBUG4, "inserting row with %d columns", numattr);
|
||||
|
||||
tupDesc = CreateTupleDesc(numattr,
|
||||
RelationGetForm(boot_reldesc)->relhasoids,
|
||||
attrtypes);
|
||||
tupDesc = CreateTupleDesc(numattr, attrtypes);
|
||||
tuple = heap_form_tuple(tupDesc, values, Nulls);
|
||||
if (objectid != (Oid) 0)
|
||||
HeapTupleSetOid(tuple, objectid);
|
||||
pfree(tupDesc); /* just free's tupDesc, not the attrtypes */
|
||||
|
||||
simple_heap_insert(boot_reldesc, tuple);
|
||||
@ -946,7 +942,7 @@ gettype(char *type)
|
||||
app = Typ;
|
||||
while ((tup = heap_getnext(scan, ForwardScanDirection)) != NULL)
|
||||
{
|
||||
(*app)->am_oid = HeapTupleGetOid(tup);
|
||||
(*app)->am_oid = ((Form_pg_type) GETSTRUCT(tup))->oid;
|
||||
memmove((char *) &(*app++)->am_typ,
|
||||
(char *) GETSTRUCT(tup),
|
||||
sizeof((*app)->am_typ));
|
||||
|
Reference in New Issue
Block a user