Commit10021fa

committed

reset per_table_parenthood_mapping completely in case of error

1 parent989092c commit10021faCopy full SHA for 10021fa

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -472,7 +472,7 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)`
`472`	`472`	`ExecuteForPlanTree(result,add_partition_filters);`
`473`	`473`
`474`	`474`	`/* Decrement parenthood_statuses refcount */`
`475`		`-decr_refcount_parenthood_statuses();`
	`475`	`+decr_refcount_parenthood_statuses(false);`
`476`	`476`
`477`	`477`	`/* HACK: restore queryId set by pg_stat_statements */`
`478`	`478`	`result->queryId=query_id;`

Lines changed: 9 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -538,8 +538,8 @@ assign_rel_parenthood_status(uint32 query_id,`
`538`	`538`	`/* Saved status conflicts with 'new_status' */`
`539`	`539`	`if (status_entry->parenthood_status!=new_status)`
`540`	`540`	`{`
`541`		`-/* Don't forget to clearall lists! */`
`542`		`-decr_refcount_parenthood_statuses();`
	`541`	`+/* Don't forget to clearALL tracked statuses! */`
	`542`	`+decr_refcount_parenthood_statuses(true);`
`543`	`543`
`544`	`544`	`elog(ERROR,"It is prohibited to apply ONLY modifier to partitioned "`
`545`	`545`	`"tables which have already been mentioned without ONLY");`
`@@ -592,10 +592,15 @@ incr_refcount_parenthood_statuses(void)`
`592`	`592`
`593`	`593`	`/* Reset all cached statuses if needed (query end) */`
`594`	`594`	`void`
`595`		`-decr_refcount_parenthood_statuses(void)`
	`595`	`+decr_refcount_parenthood_statuses(boolentirely)`
`596`	`596`	`{`
`597`	`597`	`Assert(per_table_parenthood_mapping_refcount>0);`
`598`		`-per_table_parenthood_mapping_refcount--;`
	`598`	`+`
	`599`	`+/* Should we destroy the table right now? */`
	`600`	`+if (entirely)`
	`601`	`+per_table_parenthood_mapping_refcount=0;`
	`602`	`+else`
	`603`	`+per_table_parenthood_mapping_refcount--;`
`599`	`604`
`600`	`605`	`/* Free resources if no one is using them */`
`601`	`606`	`if (per_table_parenthood_mapping_refcount==0)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void assign_rel_parenthood_status(uint32 query_id, Oid relid,`
`45`	`45`	`rel_parenthood_statusnew_status);`
`46`	`46`	`rel_parenthood_statusget_rel_parenthood_status(uint32query_id,Oidrelid);`
`47`	`47`	`voidincr_refcount_parenthood_statuses(void);`
`48`		`-voiddecr_refcount_parenthood_statuses(void);`
	`48`	`+voiddecr_refcount_parenthood_statuses(boolentirely);`
`49`	`49`
`50`	`50`
`51`	`51`	`#endif/* PLANNER_TREE_MODIFICATION_H */`

Comments

(0)