open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Return ObjectAddress in many ALTER TABLE sub-routines

Browse Source 
Since commit a2e35b53c3, most CREATE and ALTER commands return the
ObjectAddress of the affected object.  This is useful for event triggers
to try to figure out exactly what happened.  This patch extends this
idea a bit further to cover ALTER TABLE as well: an auxiliary
ObjectAddress is returned for each of several subcommands of ALTER
TABLE.  This makes it possible to decode with precision what happened
during execution of any ALTER TABLE command; for instance, which
constraint was added by ALTER TABLE ADD CONSTRAINT, or which parent got
dropped from the parents list by ALTER TABLE NO INHERIT.

As with the previous patch, there is no immediate user-visible change
here.

This is all really just continuing what c504513f83 started.

Reviewed by Stephen Frost.
pull/14/head
Alvaro Herrera 11 years ago
parent 06bf0dd6e3
commit bdc3d7fa23
6 changed files with 380 additions and 154 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 98
      src/backend/catalog/heap.c
  2. 9
      src/backend/catalog/index.c
  3. 2
      src/backend/catalog/pg_constraint.c
  4. 419
      src/backend/commands/tablecmds.c
  5. 3
      src/include/catalog/heap.h
  6. 3
      src/include/catalog/index.h

98
src/backend/catalog/heap.c
Unescape View File

@ -97,7 +97,7 @@ static ObjectAddress AddNewRelationType(const char *typeName,
Oid new_row_type, Oid new_row_type,
Oid new_array_type); Oid new_array_type);
static void RelationRemoveInheritance(Oid relid); static void RelationRemoveInheritance(Oid relid);
static void StoreRelCheck(Relation rel, char *ccname, Node *expr, static Oid StoreRelCheck(Relation rel, char *ccname, Node *expr,
bool is_validated, bool is_local, int inhcount, bool is_validated, bool is_local, int inhcount,
bool is_no_inherit, bool is_internal); bool is_no_inherit, bool is_internal);
static void StoreConstraints(Relation rel, List *cooked_constraints, static void StoreConstraints(Relation rel, List *cooked_constraints,
@ -1852,8 +1852,10 @@ heap_drop_with_catalog(Oid relid)
/* /*
* Store a default expression for column attnum of relation rel. * Store a default expression for column attnum of relation rel.
*
* Returns the OID of the new pg_attrdef tuple.
*/ */
void Oid
StoreAttrDefault(Relation rel, AttrNumber attnum, StoreAttrDefault(Relation rel, AttrNumber attnum,
Node *expr, bool is_internal) Node *expr, bool is_internal)
{ {
@ -1958,6 +1960,8 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
*/ */
InvokeObjectPostCreateHookArg(AttrDefaultRelationId, InvokeObjectPostCreateHookArg(AttrDefaultRelationId,
RelationGetRelid(rel), attnum, is_internal); RelationGetRelid(rel), attnum, is_internal);
return attrdefOid;
} }
/* /*
@ -1965,8 +1969,10 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
* *
* Caller is responsible for updating the count of constraints * Caller is responsible for updating the count of constraints
* in the pg_class entry for the relation. * in the pg_class entry for the relation.
*
* The OID of the new constraint is returned.
*/ */
static void static Oid
StoreRelCheck(Relation rel, char *ccname, Node *expr, StoreRelCheck(Relation rel, char *ccname, Node *expr,
bool is_validated, bool is_local, int inhcount, bool is_validated, bool is_local, int inhcount,
bool is_no_inherit, bool is_internal) bool is_no_inherit, bool is_internal)
@ -1976,6 +1982,7 @@ StoreRelCheck(Relation rel, char *ccname, Node *expr,
List *varList; List *varList;
int keycount; int keycount;
int16 *attNos; int16 *attNos;
Oid constrOid;
/* /*
* Flatten expression to string form for storage. * Flatten expression to string form for storage.
@ -2027,42 +2034,47 @@ StoreRelCheck(Relation rel, char *ccname, Node *expr,
/* /*
* Create the Check Constraint * Create the Check Constraint
*/ */
CreateConstraintEntry(ccname, /* Constraint Name */ constrOid =
RelationGetNamespace(rel), /* namespace */ CreateConstraintEntry(ccname, /* Constraint Name */
CONSTRAINT_CHECK, /* Constraint Type */ RelationGetNamespace(rel), /* namespace */
false, /* Is Deferrable */ CONSTRAINT_CHECK, /* Constraint Type */
false, /* Is Deferred */ false, /* Is Deferrable */
is_validated, false, /* Is Deferred */
RelationGetRelid(rel), /* relation */ is_validated,
attNos, /* attrs in the constraint */ RelationGetRelid(rel), /* relation */
keycount, /* # attrs in the constraint */ attNos, /* attrs in the constraint */
InvalidOid, /* not a domain constraint */ keycount, /* # attrs in the constraint */
InvalidOid, /* no associated index */ InvalidOid, /* not a domain constraint */
InvalidOid, /* Foreign key fields */ InvalidOid, /* no associated index */
NULL, InvalidOid, /* Foreign key fields */
NULL, NULL,
NULL, NULL,
NULL, NULL,
0, NULL,
' ', 0,
' ', ' ',
' ', ' ',
NULL, /* not an exclusion constraint */ ' ',
expr, /* Tree form of check constraint */ NULL, /* not an exclusion constraint */
ccbin, /* Binary form of check constraint */ expr, /* Tree form of check constraint */
ccsrc, /* Source form of check constraint */ ccbin, /* Binary form of check constraint */
is_local, /* conislocal */ ccsrc, /* Source form of check constraint */
inhcount, /* coninhcount */ is_local, /* conislocal */
is_no_inherit, /* connoinherit */ inhcount, /* coninhcount */
is_internal); /* internally constructed? */ is_no_inherit, /* connoinherit */
is_internal); /* internally constructed? */
pfree(ccbin); pfree(ccbin);
pfree(ccsrc); pfree(ccsrc);
return constrOid;
} }
/* /*
* Store defaults and constraints (passed as a list of CookedConstraint). * Store defaults and constraints (passed as a list of CookedConstraint).
* *
* Each CookedConstraint struct is modified to store the new catalog tuple OID.
*
* NOTE: only pre-cooked expressions will be passed this way, which is to * NOTE: only pre-cooked expressions will be passed this way, which is to
* say expressions inherited from an existing relation. Newly parsed * say expressions inherited from an existing relation. Newly parsed
* expressions can be added later, by direct calls to StoreAttrDefault * expressions can be added later, by direct calls to StoreAttrDefault
@ -2074,7 +2086,7 @@ StoreConstraints(Relation rel, List *cooked_constraints, bool is_internal)
int numchecks = 0; int numchecks = 0;
ListCell *lc; ListCell *lc;
if (!cooked_constraints) if (cooked_constraints == NIL)
return; /* nothing to do */ return; /* nothing to do */
/* /*
@ -2091,12 +2103,15 @@ StoreConstraints(Relation rel, List *cooked_constraints, bool is_internal)
switch (con->contype) switch (con->contype)
{ {
case CONSTR_DEFAULT: case CONSTR_DEFAULT:
StoreAttrDefault(rel, con->attnum, con->expr, is_internal); con->conoid = StoreAttrDefault(rel, con->attnum, con->expr,
is_internal);
break; break;
case CONSTR_CHECK: case CONSTR_CHECK:
StoreRelCheck(rel, con->name, con->expr, !con->skip_validation, con->conoid =
con->is_local, con->inhcount, StoreRelCheck(rel, con->name, con->expr,
con->is_no_inherit, is_internal); !con->skip_validation, con->is_local,
con->inhcount, con->is_no_inherit,
is_internal);
numchecks++; numchecks++;
break; break;
default: default:
@ -2184,6 +2199,7 @@ AddRelationNewConstraints(Relation rel,
{ {
RawColumnDefault *colDef = (RawColumnDefault *) lfirst(cell); RawColumnDefault *colDef = (RawColumnDefault *) lfirst(cell);
Form_pg_attribute atp = rel->rd_att->attrs[colDef->attnum - 1]; Form_pg_attribute atp = rel->rd_att->attrs[colDef->attnum - 1];
Oid defOid;
expr = cookDefault(pstate, colDef->raw_default, expr = cookDefault(pstate, colDef->raw_default,
atp->atttypid, atp->atttypmod, atp->atttypid, atp->atttypmod,
@ -2204,10 +2220,11 @@ AddRelationNewConstraints(Relation rel,
(IsA(expr, Const) &&((Const *) expr)->constisnull)) (IsA(expr, Const) &&((Const *) expr)->constisnull))
continue; continue;
StoreAttrDefault(rel, colDef->attnum, expr, is_internal); defOid = StoreAttrDefault(rel, colDef->attnum, expr, is_internal);
cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint)); cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
cooked->contype = CONSTR_DEFAULT; cooked->contype = CONSTR_DEFAULT;
cooked->conoid = defOid;
cooked->name = NULL; cooked->name = NULL;
cooked->attnum = colDef->attnum; cooked->attnum = colDef->attnum;
cooked->expr = expr; cooked->expr = expr;
@ -2227,6 +2244,7 @@ AddRelationNewConstraints(Relation rel,
{ {
Constraint *cdef = (Constraint *) lfirst(cell); Constraint *cdef = (Constraint *) lfirst(cell);
char *ccname; char *ccname;
Oid constrOid;
if (cdef->contype != CONSTR_CHECK) if (cdef->contype != CONSTR_CHECK)
continue; continue;
@ -2329,13 +2347,15 @@ AddRelationNewConstraints(Relation rel,
/* /*
* OK, store it. * OK, store it.
*/ */
StoreRelCheck(rel, ccname, expr, !cdef->skip_validation, is_local, constrOid =
is_local ? 0 : 1, cdef->is_no_inherit, is_internal); StoreRelCheck(rel, ccname, expr, !cdef->skip_validation, is_local,
is_local ? 0 : 1, cdef->is_no_inherit, is_internal);
numchecks++; numchecks++;
cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint)); cooked = (CookedConstraint *) palloc(sizeof(CookedConstraint));
cooked->contype = CONSTR_CHECK; cooked->contype = CONSTR_CHECK;
cooked->conoid = constrOid;
cooked->name = ccname; cooked->name = ccname;
cooked->attnum = 0; cooked->attnum = 0;
cooked->expr = expr; cooked->expr = expr;

9
src/backend/catalog/index.c
Unescape View File

@ -675,7 +675,7 @@ UpdateIndexRelation(Oid indexoid,
* to fix it up. * to fix it up.
* is_internal: if true, post creation hook for new index * is_internal: if true, post creation hook for new index
* if_not_exists: if true, do not throw an error if a relation with * if_not_exists: if true, do not throw an error if a relation with
* the same name already exists. * the same name already exists.
* *
* Returns the OID of the created index. * Returns the OID of the created index.
*/ */
@ -1111,7 +1111,8 @@ index_create(Relation heapRelation,
/* /*
* index_constraint_create * index_constraint_create
* *
* Set up a constraint associated with an index * Set up a constraint associated with an index. Return the new constraint's
* address.
* *
* heapRelation: table owning the index (must be suitably locked by caller) * heapRelation: table owning the index (must be suitably locked by caller)
* indexRelationId: OID of the index * indexRelationId: OID of the index
@ -1128,7 +1129,7 @@ index_create(Relation heapRelation,
* allow_system_table_mods: allow table to be a system catalog * allow_system_table_mods: allow table to be a system catalog
* is_internal: index is constructed due to internal process * is_internal: index is constructed due to internal process
*/ */
void ObjectAddress
index_constraint_create(Relation heapRelation, index_constraint_create(Relation heapRelation,
Oid indexRelationId, Oid indexRelationId,
IndexInfo *indexInfo, IndexInfo *indexInfo,
@ -1316,6 +1317,8 @@ index_constraint_create(Relation heapRelation,
heap_freetuple(indexTuple); heap_freetuple(indexTuple);
heap_close(pg_index, RowExclusiveLock); heap_close(pg_index, RowExclusiveLock);
} }
return referenced;
} }
/* /*

2
src/backend/catalog/pg_constraint.c
Unescape View File

@ -40,6 +40,8 @@
* Subsidiary records (such as triggers or indexes to implement the * Subsidiary records (such as triggers or indexes to implement the
* constraint) are *not* created here. But we do make dependency links * constraint) are *not* created here. But we do make dependency links
* from the constraint to the things it depends on. * from the constraint to the things it depends on.
*
* The new constraint's OID is returned.
*/ */
Oid Oid
CreateConstraintEntry(const char *constraintName, CreateConstraintEntry(const char *constraintName,

419
src/backend/commands/tablecmds.c
View File

File diff suppressed because it is too large Load Diff

3
src/include/catalog/heap.h
Unescape View File

@ -28,6 +28,7 @@ typedef struct RawColumnDefault
typedef struct CookedConstraint typedef struct CookedConstraint
{ {
ConstrType contype; /* CONSTR_DEFAULT or CONSTR_CHECK */ ConstrType contype; /* CONSTR_DEFAULT or CONSTR_CHECK */
Oid conoid; /* constr OID if created, otherwise Invalid */
char *name; /* name, or NULL if none */ char *name; /* name, or NULL if none */
AttrNumber attnum; /* which attr (only for DEFAULT) */ AttrNumber attnum; /* which attr (only for DEFAULT) */
Node *expr; /* transformed default or check expr */ Node *expr; /* transformed default or check expr */
@ -101,7 +102,7 @@ extern List *AddRelationNewConstraints(Relation rel,
bool is_local, bool is_local,
bool is_internal); bool is_internal);
extern void StoreAttrDefault(Relation rel, AttrNumber attnum, extern Oid StoreAttrDefault(Relation rel, AttrNumber attnum,
Node *expr, bool is_internal); Node *expr, bool is_internal);
extern Node *cookDefault(ParseState *pstate, extern Node *cookDefault(ParseState *pstate,

3
src/include/catalog/index.h
Unescape View File

@ -14,6 +14,7 @@
#ifndef INDEX_H #ifndef INDEX_H
#define INDEX_H #define INDEX_H
#include "catalog/objectaddress.h"
#include "nodes/execnodes.h" #include "nodes/execnodes.h"
@ -63,7 +64,7 @@ extern Oid index_create(Relation heapRelation,
bool is_internal, bool is_internal,
bool if_not_exists); bool if_not_exists);
extern void index_constraint_create(Relation heapRelation, extern ObjectAddress index_constraint_create(Relation heapRelation,
Oid indexRelationId, Oid indexRelationId,
IndexInfo *indexInfo, IndexInfo *indexInfo,
const char *constraintName, const char *constraintName,

Write Preview
Loading…
Cancel
Save