mirror of
				https://github.com/postgres/postgres.git
				synced 2025-11-03 09:13:20 +03:00 
			
		
		
		
	Fix creation of partition descriptor during concurrent detach+drop
If a partition undergoes DETACH CONCURRENTLY immediately followed by DROP, this could cause a problem for a concurrent transaction recomputing the partition descriptor when running a prepared statement, because it tries to dereference a pointer to a tuple that's not found in a catalog scan. The existing retry logic added in commitdbca3469ebis sufficient to cope with the overall problem, provided we don't try to dereference a non-existant heap tuple. Arguably, the code in RelationBuildPartitionDesc() has been wrong all along, since no check was added in commit898e5e3290against receiving a NULL tuple from the catalog scan; that bug has only become user-visible with DETACH CONCURRENTLY which was added in branch 14. Therefore, even though there's no known mechanism to cause a crash because of this, backpatch the addition of such a check to all supported branches. In branches prior to 14, this would cause the code to fail with a "missing relpartbound for relation XYZ" error instead of crashing; that's okay, because there are no reports of such behavior anyway. Author: Kuntal Ghosh <kuntalghosh.2007@gmail.com> Reviewed-by: Junwang Zhao <zhjwpku@gmail.com> Reviewed-by: Tender Wang <tndrwang@gmail.com> Discussion: https://postgr.es/m/18559-b48286d2eacd9a4e@postgresql.org
This commit is contained in:
		@@ -164,8 +164,6 @@ RelationBuildPartitionDesc(Relation rel)
 | 
				
			|||||||
			Relation	pg_class;
 | 
								Relation	pg_class;
 | 
				
			||||||
			SysScanDesc scan;
 | 
								SysScanDesc scan;
 | 
				
			||||||
			ScanKeyData key[1];
 | 
								ScanKeyData key[1];
 | 
				
			||||||
			Datum		datum;
 | 
					 | 
				
			||||||
			bool		isnull;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
			pg_class = table_open(RelationRelationId, AccessShareLock);
 | 
								pg_class = table_open(RelationRelationId, AccessShareLock);
 | 
				
			||||||
			ScanKeyInit(&key[0],
 | 
								ScanKeyInit(&key[0],
 | 
				
			||||||
@@ -175,10 +173,16 @@ RelationBuildPartitionDesc(Relation rel)
 | 
				
			|||||||
			scan = systable_beginscan(pg_class, ClassOidIndexId, true,
 | 
								scan = systable_beginscan(pg_class, ClassOidIndexId, true,
 | 
				
			||||||
									  NULL, 1, key);
 | 
														  NULL, 1, key);
 | 
				
			||||||
			tuple = systable_getnext(scan);
 | 
								tuple = systable_getnext(scan);
 | 
				
			||||||
			datum = heap_getattr(tuple, Anum_pg_class_relpartbound,
 | 
								if (HeapTupleIsValid(tuple))
 | 
				
			||||||
								 RelationGetDescr(pg_class), &isnull);
 | 
								{
 | 
				
			||||||
			if (!isnull)
 | 
									Datum		datum;
 | 
				
			||||||
				boundspec = stringToNode(TextDatumGetCString(datum));
 | 
									bool		isnull;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
									datum = heap_getattr(tuple, Anum_pg_class_relpartbound,
 | 
				
			||||||
 | 
														 RelationGetDescr(pg_class), &isnull);
 | 
				
			||||||
 | 
									if (!isnull)
 | 
				
			||||||
 | 
										boundspec = stringToNode(TextDatumGetCString(datum));
 | 
				
			||||||
 | 
								}
 | 
				
			||||||
			systable_endscan(scan);
 | 
								systable_endscan(scan);
 | 
				
			||||||
			table_close(pg_class, AccessShareLock);
 | 
								table_close(pg_class, AccessShareLock);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user