Commite78e951

Marina Polyakova

committed

Merge remote-tracking branch 'origin/PGPRO-9874'

2 parents07f0a98 +ba5c4c7 commite78e951Copy full SHA for e78e951

File tree

+13

-5

lines changed

+13

-5

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,8 @@ spawn_partitions_val(Oid parent_relid,/* parent's Oid */`
`606`	`606`
`607`	`607`	`/* Get typname of range_bound_type to perform cast */`
`608`	`608`	`typeTuple=SearchSysCache1(TYPEOID,ObjectIdGetDatum(range_bound_type));`
`609`		`-Assert(HeapTupleIsValid(typeTuple));`
	`609`	`+if (!HeapTupleIsValid(typeTuple))`
	`610`	`+elog(ERROR,"cache lookup failed for type %u",range_bound_type);`
`610`	`611`	`typname=pstrdup(NameStr(((Form_pg_type)GETSTRUCT(typeTuple))->typname));`
`611`	`612`	`ReleaseSysCache(typeTuple);`
`612`	`613`

Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1167,7 +1167,7 @@ invalidate_bounds_cache(void)`
`1167`	`1167`	`/*`
`1168`	`1168`	`* Get constraint expression tree of a partition.`
`1169`	`1169`	`*`
`1170`		`- *build_check_constraint_name_internal() is used to build conname.`
	`1170`	`+ *build_check_constraint_name_relid_internal() is used to build conname.`
`1171`	`1171`	`*/`
`1172`	`1172`	`Expr*`
`1173`	`1173`	`get_partition_constraint_expr(Oidpartition,boolraise_error)`
`@@ -1193,6 +1193,16 @@ get_partition_constraint_expr(Oid partition, bool raise_error)`
`1193`	`1193`	`}`
`1194`	`1194`
`1195`	`1195`	`con_tuple=SearchSysCache1(CONSTROID,ObjectIdGetDatum(conid));`
	`1196`	`+if (!HeapTupleIsValid(con_tuple))`
	`1197`	`+{`
	`1198`	`+if (!raise_error)`
	`1199`	`+returnNULL;`
	`1200`	`+`
	`1201`	`+ereport(ERROR,`
	`1202`	`+(errmsg("cache lookup failed for constraint \"%s\" of partition \"%s\"",`
	`1203`	`+conname,get_rel_name_or_relid(partition))));`
	`1204`	`+}`
	`1205`	`+`
`1196`	`1206`	`conbin_datum=SysCacheGetAttr(CONSTROID,con_tuple,`
`1197`	`1207`	`Anum_pg_constraint_conbin,`
`1198`	`1208`	`&conbin_isnull);`
`@@ -1204,9 +1214,6 @@ get_partition_constraint_expr(Oid partition, bool raise_error)`
`1204`	`1214`	`ereport(ERROR,`
`1205`	`1215`	`(errmsg("constraint \"%s\" of partition \"%s\" has NULL conbin",`
`1206`	`1216`	`conname,get_rel_name_or_relid(partition))));`
`1207`		`-pfree(conname);`
`1208`		`-`
`1209`		`-returnNULL;/* could not parse */`
`1210`	`1217`	`}`
`1211`	`1218`	`pfree(conname);`
`1212`	`1219`

Comments

(0)