Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit468a970

Browse files
committed
Change StoreCatalogInheritance() to work from a list of parent relation
OIDs rather than names. Aside from being simpler and faster, this waydoesn't blow up in the face of 'create temp table foo () inherits (foo)'.Which is a rather odd thing to do, but it seems some people want to.
1 parent7809923 commit468a970

File tree

1 file changed

+55
-64
lines changed

1 file changed

+55
-64
lines changed

‎src/backend/commands/creatinh.c

Lines changed: 55 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.67 2000/11/16 22:30:18 tgl Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/commands/Attic/creatinh.c,v 1.68 2000/12/14 00:41:09 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -34,10 +34,10 @@
3434

3535
staticintcheckAttrExists(constchar*attributeName,
3636
constchar*attributeType,List*schema);
37-
staticList*MergeAttributes(List*schema,List*supers,List**supconstr);
37+
staticList*MergeAttributes(List*schema,List*supers,
38+
List**supOids,List**supconstr);
3839
staticvoidStoreCatalogInheritance(OidrelationId,List*supers);
39-
staticvoid
40-
setRelhassubclassInRelation(OidrelationId,boolrelhassubclass);
40+
staticvoidsetRelhassubclassInRelation(OidrelationId,boolrelhassubclass);
4141

4242

4343
/* ----------------------------------------------------------------
@@ -53,8 +53,8 @@ DefineRelation(CreateStmt *stmt, char relkind)
5353
intnumberOfAttributes;
5454
OidrelationId;
5555
Relationrel;
56-
List*inheritList;
5756
TupleDescdescriptor;
57+
List*inheritOids;
5858
List*old_constraints;
5959
List*rawDefaults;
6060
List*listptr;
@@ -67,24 +67,16 @@ DefineRelation(CreateStmt *stmt, char relkind)
6767
StrNCpy(relname,stmt->relname,NAMEDATALEN);
6868

6969
/* ----------------
70-
*Handle parameters
71-
*XXX parameter handling missing below.
70+
*Look up inheritance ancestors and generate relation schema,
71+
*including inherited attributes.
7272
* ----------------
7373
*/
74-
inheritList=stmt->inhRelnames;
75-
76-
/* ----------------
77-
*generate relation schema, including inherited attributes.
78-
* ----------------
79-
*/
80-
schema=MergeAttributes(schema,inheritList,&old_constraints);
74+
schema=MergeAttributes(schema,stmt->inhRelnames,
75+
&inheritOids,&old_constraints);
8176

8277
numberOfAttributes=length(schema);
8378
if (numberOfAttributes <=0)
84-
{
85-
elog(ERROR,"DefineRelation: %s",
86-
"please inherit from a relation or define an attribute");
87-
}
79+
elog(ERROR,"DefineRelation: please inherit from a relation or define an attribute");
8880

8981
/* ----------------
9082
*create a relation descriptor from the relation schema
@@ -147,7 +139,7 @@ DefineRelation(CreateStmt *stmt, char relkind)
147139
relkind,stmt->istemp,
148140
allowSystemTableMods);
149141

150-
StoreCatalogInheritance(relationId,inheritList);
142+
StoreCatalogInheritance(relationId,inheritOids);
151143

152144
/*
153145
* We must bump the command counter to make the newly-created relation
@@ -286,10 +278,15 @@ change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
286278
* MergeAttributes
287279
*Returns new schema given initial schema and supers.
288280
*
281+
* Input arguments:
289282
*
290283
* 'schema' is the column/attribute definition for the table. (It's a list
291284
*of ColumnDef's.) It is destructively changed.
292-
* 'inheritList' is the list of inherited relations (a list of Value(str)'s).
285+
* 'supers' is a list of names (as Value objects) of parent relations.
286+
*
287+
* Output arguments:
288+
* 'supOids' receives an integer list of the OIDs of the parent relations.
289+
* 'supconstr' receives a list of constraints belonging to the parents.
293290
*
294291
* Notes:
295292
* The order in which the attributes are inherited is very important.
@@ -314,12 +311,14 @@ change_varattnos_of_a_node(Node *node, const AttrNumber *newattno)
314311
* stud_emp {7:percent}
315312
*/
316313
staticList*
317-
MergeAttributes(List*schema,List*supers,List**supconstr)
314+
MergeAttributes(List*schema,List*supers,
315+
List**supOids,List**supconstr)
318316
{
319317
List*entry;
320318
List*inhSchema=NIL;
319+
List*parentOids=NIL;
321320
List*constraints=NIL;
322-
intattnums;
321+
intattnums;
323322

324323
/*
325324
* Validates that there are no duplications. Validity checking of
@@ -338,7 +337,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
338337
*/
339338
ColumnDef*restdef=lfirst(rest);
340339

341-
if (!strcmp(coldef->colname,restdef->colname))
340+
if (strcmp(coldef->colname,restdef->colname)==0)
342341
{
343342
elog(ERROR,"CREATE TABLE: attribute \"%s\" duplicated",
344343
coldef->colname);
@@ -351,7 +350,7 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
351350

352351
foreach(rest,lnext(entry))
353352
{
354-
if (!strcmp(strVal(lfirst(entry)),strVal(lfirst(rest))))
353+
if (strcmp(strVal(lfirst(entry)),strVal(lfirst(rest)))==0)
355354
{
356355
elog(ERROR,"CREATE TABLE: inherited relation \"%s\" duplicated",
357356
strVal(lfirst(entry)));
@@ -376,6 +375,11 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
376375
inti,attidx,attno_exist;
377376

378377
relation=heap_openr(name,AccessShareLock);
378+
379+
if (relation->rd_rel->relkind!=RELKIND_RELATION)
380+
elog(ERROR,"CREATE TABLE: inherited relation \"%s\" is not a table",name);
381+
382+
parentOids=lappendi(parentOids,relation->rd_id);
379383
setRelhassubclassInRelation(relation->rd_id, true);
380384
tupleDesc=RelationGetDescr(relation);
381385
/* allocate a new attribute number table and initialize */
@@ -391,9 +395,6 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
391395
partialAttidx [i]=0;
392396
constr=tupleDesc->constr;
393397

394-
if (relation->rd_rel->relkind!=RELKIND_RELATION)
395-
elog(ERROR,"CREATE TABLE: inherited relation \"%s\" is not a table",name);
396-
397398
attidx=0;
398399
for (attrno=relation->rd_rel->relnatts-1;attrno >=0;attrno--)
399400
{
@@ -519,13 +520,18 @@ MergeAttributes(List *schema, List *supers, List **supconstr)
519520
* put the inherited schema before our the schema for this table
520521
*/
521522
schema=nconc(inhSchema,schema);
523+
524+
*supOids=parentOids;
522525
*supconstr=constraints;
523526
returnschema;
524527
}
525528

526529
/*
527530
* StoreCatalogInheritance
528531
*Updates the system catalogs with proper inheritance information.
532+
*
533+
* supers is an integer list of the OIDs of the new relation's direct
534+
* ancestors. NB: it is destructively changed to include indirect ancestors.
529535
*/
530536
staticvoid
531537
StoreCatalogInheritance(OidrelationId,List*supers)
@@ -534,7 +540,6 @@ StoreCatalogInheritance(Oid relationId, List *supers)
534540
TupleDescdesc;
535541
int16seqNumber;
536542
List*entry;
537-
List*idList;
538543
HeapTupletuple;
539544

540545
/* ----------------
@@ -547,32 +552,19 @@ StoreCatalogInheritance(Oid relationId, List *supers)
547552
return;
548553

549554
/* ----------------
550-
* Catalog INHERITS information.
555+
* Catalog INHERITS information using direct ancestors only.
551556
* ----------------
552557
*/
553558
relation=heap_openr(InheritsRelationName,RowExclusiveLock);
554559
desc=RelationGetDescr(relation);
555560

556561
seqNumber=1;
557-
idList=NIL;
558562
foreach(entry,supers)
559563
{
560-
OidentryOid;
564+
OidentryOid=lfirsti(entry);
561565
Datumdatum[Natts_pg_inherits];
562566
charnullarr[Natts_pg_inherits];
563567

564-
entryOid=GetSysCacheOid(RELNAME,
565-
PointerGetDatum(strVal(lfirst(entry))),
566-
0,0,0);
567-
if (!OidIsValid(entryOid))
568-
elog(ERROR,"StoreCatalogInheritance: cache lookup failed for relation \"%s\"",
569-
strVal(lfirst(entry)));
570-
571-
/*
572-
* build idList for use below
573-
*/
574-
idList=lappendi(idList,entryOid);
575-
576568
datum[0]=ObjectIdGetDatum(relationId);/* inhrel */
577569
datum[1]=ObjectIdGetDatum(entryOid);/* inhparent */
578570
datum[2]=Int16GetDatum(seqNumber);/* inhseqno */
@@ -602,21 +594,20 @@ StoreCatalogInheritance(Oid relationId, List *supers)
602594
heap_close(relation,RowExclusiveLock);
603595

604596
/* ----------------
605-
*Catalog IPL information.
597+
*Expand supers list to include indirect ancestors as well.
606598
*
607599
* Algorithm:
608-
*0.list superclasses (by Oid) in order given (see idList).
600+
*0.begin with list of direct superclasses.
609601
*1. append after each relationId, its superclasses, recursively.
610-
*3. remove all but last of duplicates.
611-
*4. store result.
602+
*2. remove all but last of duplicates.
612603
* ----------------
613604
*/
614605

615606
/* ----------------
616-
*1.
607+
*1. append after each relationId, its superclasses, recursively.
617608
* ----------------
618609
*/
619-
foreach(entry,idList)
610+
foreach(entry,supers)
620611
{
621612
HeapTupletuple;
622613
Oidid;
@@ -649,20 +640,21 @@ StoreCatalogInheritance(Oid relationId, List *supers)
649640
}
650641

651642
/* ----------------
652-
*2.
643+
*2. remove all but last of duplicates.
653644
* ----------------
654645
*/
655-
foreach(entry,idList)
646+
foreach(entry,supers)
656647
{
657-
Oidname;
648+
Oidthisone;
649+
boolfound;
658650
List*rest;
659-
boolfound= false;
660651

661652
again:
662-
name=lfirsti(entry);
653+
thisone=lfirsti(entry);
654+
found= false;
663655
foreach(rest,lnext(entry))
664656
{
665-
if (name==lfirsti(rest))
657+
if (thisone==lfirsti(rest))
666658
{
667659
found= true;
668660
break;
@@ -672,28 +664,25 @@ StoreCatalogInheritance(Oid relationId, List *supers)
672664
{
673665

674666
/*
675-
* entry list must be of length >= 2 or else no match
676-
*
677-
* so, remove this entry.
667+
* found a later duplicate, so remove this entry.
678668
*/
679-
lfirst(entry)=lfirst(lnext(entry));
669+
lfirsti(entry)=lfirsti(lnext(entry));
680670
lnext(entry)=lnext(lnext(entry));
681671

682-
found= false;
683672
gotoagain;
684673
}
685674
}
686675

687676
/* ----------------
688-
*3.
677+
* Catalog IPL information using expanded list.
689678
* ----------------
690679
*/
691680
relation=heap_openr(InheritancePrecidenceListRelationName,RowExclusiveLock);
692681
desc=RelationGetDescr(relation);
693682

694683
seqNumber=1;
695684

696-
foreach(entry,idList)
685+
foreach(entry,supers)
697686
{
698687
Datumdatum[Natts_pg_ipl];
699688
charnullarr[Natts_pg_ipl];
@@ -721,10 +710,12 @@ StoreCatalogInheritance(Oid relationId, List *supers)
721710

722711

723712
/*
724-
* returns the index(star with 1) if attribute already exists in schema, 0 otherwise.
713+
* returns the index (starting with 1) if attribute already exists in schema,
714+
* 0 if it doesn't.
725715
*/
726716
staticint
727-
checkAttrExists(constchar*attributeName,constchar*attributeType,List*schema)
717+
checkAttrExists(constchar*attributeName,constchar*attributeType,
718+
List*schema)
728719
{
729720
List*s;
730721
inti=0;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp