reset per_table_parenthood_mapping completely in case of error

funbringer · funbringer · commit 10021fa9fff5 · 2016-11-03T16:22:41.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -472,7 +472,7 @@ pathman_planner_hook(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		ExecuteForPlanTree(result, add_partition_filters);
 
 		/* Decrement parenthood_statuses refcount */
-		decr_refcount_parenthood_statuses();
+		decr_refcount_parenthood_statuses(false);
 
 		/* HACK: restore queryId set by pg_stat_statements */
 		result->queryId = query_id;
diff --git a/src/planner_tree_modification.c b/src/planner_tree_modification.c
@@ -538,8 +538,8 @@ assign_rel_parenthood_status(uint32 query_id,
 		/* Saved status conflicts with 'new_status' */
 		if (status_entry->parenthood_status != new_status)
 		{
-			/* Don't forget to clear all lists! */
-			decr_refcount_parenthood_statuses();
+			/* Don't forget to clear ALL tracked statuses! */
+			decr_refcount_parenthood_statuses(true);
 
 			elog(ERROR, "It is prohibited to apply ONLY modifier to partitioned "
 						"tables which have already been mentioned without ONLY");
@@ -592,10 +592,15 @@ incr_refcount_parenthood_statuses(void)
 
 /* Reset all cached statuses if needed (query end) */
 void
-decr_refcount_parenthood_statuses(void)
+decr_refcount_parenthood_statuses(bool entirely)
 {
 	Assert(per_table_parenthood_mapping_refcount > 0);
-	per_table_parenthood_mapping_refcount--;
+
+	/* Should we destroy the table right now? */
+	if (entirely)
+		per_table_parenthood_mapping_refcount = 0;
+	else
+		per_table_parenthood_mapping_refcount--;
 
 	/* Free resources if no one is using them */
 	if (per_table_parenthood_mapping_refcount == 0)
diff --git a/src/planner_tree_modification.h b/src/planner_tree_modification.h
@@ -45,7 +45,7 @@ void assign_rel_parenthood_status(uint32 query_id, Oid relid,
 								  rel_parenthood_status new_status);
 rel_parenthood_status get_rel_parenthood_status(uint32 query_id, Oid relid);
 void incr_refcount_parenthood_statuses(void);
-void decr_refcount_parenthood_statuses(void);
+void decr_refcount_parenthood_statuses(bool entirely);
 
 
 #endif /* PLANNER_TREE_MODIFICATION_H */
