Commitb0e32cd

Maksim Milyutin

committed

Add flag IsBgWorker to create_partitions_for_value_internal function

1 parente133699 commitb0e32cdCopy full SHA for b0e32cd

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,8 @@ create_partitions_for_value(Oid relid, Datum value, Oid value_type)`
`270`	`270`	`elog(DEBUG2,"create_partitions(): chose backend [%u]",MyProcPid);`
`271`	`271`	`last_partition=create_partitions_for_value_internal(relid,`
`272`	`272`	`value,`
`273`		`-value_type);`
	`273`	`+value_type,`
	`274`	`+ false);`
`274`	`275`	`}`
`275`	`276`	`}`
`276`	`277`	`else`
`@@ -299,7 +300,7 @@ create_partitions_for_value(Oid relid, Datum value, Oid value_type)`
`299`	`300`	`* use create_partitions_for_value() instead.`
`300`	`301`	`*/`
`301`	`302`	`Oid`
`302`		`-create_partitions_for_value_internal(Oidrelid,Datumvalue,Oidvalue_type)`
	`303`	`+create_partitions_for_value_internal(Oidrelid,Datumvalue,Oidvalue_type,boolIsBgWorker)`
`303`	`304`	`{`
`304`	`305`	`MemoryContextold_mcxt=CurrentMemoryContext;`
`305`	`306`	`Oidpartid=InvalidOid;/* last created partition (or InvalidOid) */`
`@@ -405,7 +406,7 @@ create_partitions_for_value_internal(Oid relid, Datum value, Oid value_type)`
`405`	`406`	`ErrorData*edata;`
`406`	`407`
`407`	`408`	`/* Simply rethrow ERROR if we're in backend */`
`408`		`-if (!IsBackgroundWorker)`
	`409`	`+if (!IsBgWorker)`
`409`	`410`	`PG_RE_THROW();`
`410`	`411`
`411`	`412`	`/* Switch to the original context & copy edata */`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`
`25`	`25`	`/* Create RANGE partitions to store some value */`
`26`	`26`	`Oidcreate_partitions_for_value(Oidrelid,Datumvalue,Oidvalue_type);`
`27`		`-Oidcreate_partitions_for_value_internal(Oidrelid,Datumvalue,Oidvalue_type);`
	`27`	`+Oidcreate_partitions_for_value_internal(Oidrelid,Datumvalue,Oidvalue_type,boolIsBgWorker);`
`28`	`28`
`29`	`29`
`30`	`30`	`/* Create one RANGE partition */`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -366,8 +366,8 @@ bgw_main_spawn_partitions(Datum main_arg)`
`366`	`366`	`args->parallel_master_pid))`
`367`	`367`	`return;`
`368`	`368`	`#endif`
`369`		`-`
`370`	`369`	`/* Establish connection and start transaction */`
	`370`	`+`
`371`	`371`	`BackgroundWorkerInitializeConnectionByOid(args->dbid,args->userid);`
`372`	`372`
`373`	`373`	`/* Start new transaction (syscache access etc.) */`
`@@ -392,7 +392,8 @@ bgw_main_spawn_partitions(Datum main_arg)`
`392`	`392`	`/* Create partitions and save the Oid of the last one */`
`393`	`393`	`args->result=create_partitions_for_value_internal(args->partitioned_table,`
`394`	`394`	`value,/* unpacked Datum */`
`395`		`-args->value_type);`
	`395`	`+args->value_type,`
	`396`	`+true);/* run under background woker */`
`396`	`397`
`397`	`398`	`/* Finish transaction in an appropriate way */`
`398`	`399`	`if (args->result==InvalidOid)`

Comments

(0)