mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid theoretical infinite loop loading relcache partition key.

Browse Source 
Amit Langote, per report from 甄明洋

Discussion: http://postgr.es/m/57bd1e1.1886.15bd7b79cee.Coremail.18612389267@yeah.net
This commit is contained in:
Robert Haas 2017-05-09 23:51:54 -04:00
parent e17628145a
commit 622c82279d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/utils/cache/relcache.c vendored
View File

@ -3858,13 +3858,20 @@ RelationCacheInitializePhase3(void)
} }
/* /*
* Reload partition key and descriptor for a partitioned table. * Reload the partition key and descriptor for a partitioned table.
*/ */
if (relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE) if (relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE &&
relation->rd_partkey == NULL)
{ {
RelationBuildPartitionKey(relation); RelationBuildPartitionKey(relation);
Assert(relation->rd_partkey != NULL); Assert(relation->rd_partkey != NULL);
restart = true;
}
if (relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE &&
relation->rd_partdesc == NULL)
{
RelationBuildPartitionDesc(relation); RelationBuildPartitionDesc(relation);
Assert(relation->rd_partdesc != NULL); Assert(relation->rd_partdesc != NULL);