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

Commit52ab02d

Browse files
committed
Simplify partitioned table creation vs. relcache
In the original code, we were storing the pg_inherits row for apartitioned table too early: enough that we had a hack for relcache toavoid falling flat on its face while reading such a partial entry. Ifwe finish the pg_class creation first and *then* store the pg_inheritsentry, we don't need that hack.Also recognize that pg_class.relpartbound is not marked NOT NULL andtherefore it's entirely possible to read null values, so having onlyAssert() protection isn't enough. Change those to if/elog testsinstead. This qualifies as a robustness fix, so backpatch to pg11.In passing, remove one access that wasn't actually needed, and rewordone message to be like all the others that check for the same thing.Reviewed-by: Amit LangoteDiscussion:https://postgr.es/m/20180903213916.hh6wasnrdg6xv2ud@alvherre.pgsql
1 parent838fd62 commit52ab02d

File tree

3 files changed

+9
-25
lines changed

3 files changed

+9
-25
lines changed

‎src/backend/commands/tablecmds.c‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -770,9 +770,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
770770
InvalidOid,
771771
typaddress);
772772

773-
/* Store inheritance information for new rel. */
774-
StoreCatalogInheritance(relationId,inheritOids,stmt->partbound!=NULL);
775-
776773
/*
777774
* We must bump the command counter to make the newly-created relation
778775
* tuple visible for opening.
@@ -866,6 +863,9 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
866863
heap_close(parent,NoLock);
867864
}
868865

866+
/* Store inheritance information for new rel. */
867+
StoreCatalogInheritance(relationId,inheritOids,stmt->partbound!=NULL);
868+
869869
/*
870870
* Process the partitioning specification (if any) and store the partition
871871
* key information into the catalog.
@@ -14648,10 +14648,6 @@ ATExecDetachPartition(Relation rel, RangeVar *name)
1464814648
RelationGetRelid(partRel));
1464914649
Assert(((Form_pg_class)GETSTRUCT(tuple))->relispartition);
1465014650

14651-
(void)SysCacheGetAttr(RELOID,tuple,Anum_pg_class_relpartbound,
14652-
&isnull);
14653-
Assert(!isnull);
14654-
1465514651
/* Clear relpartbound and reset relispartition */
1465614652
memset(new_val,0,sizeof(new_val));
1465714653
memset(new_null, false,sizeof(new_null));

‎src/backend/partitioning/partbounds.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1641,8 +1641,9 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
16411641
datum=SysCacheGetAttr(RELOID,tuple,
16421642
Anum_pg_class_relpartbound,
16431643
&isnull);
1644+
if (isnull)
1645+
elog(ERROR,"null relpartbound for relation %u",inhrelid);
16441646

1645-
Assert(!isnull);
16461647
bspec= (PartitionBoundSpec*)
16471648
stringToNode(TextDatumGetCString(datum));
16481649
if (!IsA(bspec,PartitionBoundSpec))

‎src/backend/utils/cache/partcache.c‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -302,23 +302,11 @@ RelationBuildPartitionDesc(Relation rel)
302302
if (!HeapTupleIsValid(tuple))
303303
elog(ERROR,"cache lookup failed for relation %u",inhrelid);
304304

305-
/*
306-
* It is possible that the pg_class tuple of a partition has not been
307-
* updated yet to set its relpartbound field. The only case where
308-
* this happens is when we open the parent relation to check using its
309-
* partition descriptor that a new partition's bound does not overlap
310-
* some existing partition.
311-
*/
312-
if (!((Form_pg_class)GETSTRUCT(tuple))->relispartition)
313-
{
314-
ReleaseSysCache(tuple);
315-
continue;
316-
}
317-
318305
datum=SysCacheGetAttr(RELOID,tuple,
319306
Anum_pg_class_relpartbound,
320307
&isnull);
321-
Assert(!isnull);
308+
if (isnull)
309+
elog(ERROR,"null relpartbound for relation %u",inhrelid);
322310
boundspec= (Node*)stringToNode(TextDatumGetCString(datum));
323311

324312
/*
@@ -883,9 +871,8 @@ generate_partition_qual(Relation rel)
883871
boundDatum=SysCacheGetAttr(RELOID,tuple,
884872
Anum_pg_class_relpartbound,
885873
&isnull);
886-
if (isnull)/* should not happen */
887-
elog(ERROR,"relation \"%s\" has relpartbound = null",
888-
RelationGetRelationName(rel));
874+
if (isnull)
875+
elog(ERROR,"null relpartbound for relation %u",RelationGetRelid(rel));
889876
bound=castNode(PartitionBoundSpec,
890877
stringToNode(TextDatumGetCString(boundDatum)));
891878
ReleaseSysCache(tuple);

0 commit comments

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