Add list of currently used feature spaces in the backend.

danolivo · danolivo · commit ce7188c0df69 · 2021-06-25T21:53:14.000+03:00
It is needed to exclude problems with recursive execution induced
by cache invalidation.
Change parallel schedule for regression tests.
diff --git a/aqo.c b/aqo.c
@@ -125,6 +125,12 @@ aqo_free_callback(ResourceReleasePhase phase,
 		pfree(query_text);
 		query_text = NULL;
 	}
+
+	if (isTopLevel)
+	{
+		list_free(cur_classes);
+		cur_classes = NIL;
+	}
 }
 
 void
diff --git a/aqo.h b/aqo.h
@@ -385,4 +385,5 @@ void		selectivity_cache_clear(void);
 extern Oid get_aqo_schema(void);
 extern void init_lock_tag(LOCKTAG *tag, uint32 key1, uint32 key2);
 
+extern List *cur_classes;
 #endif
diff --git a/parallel_schedule b/parallel_schedule
@@ -1,5 +1,4 @@
 # ----------
-# src/test/regress/parallel_schedule
 #
 # By convention, we put no more than twenty tests in any one parallel group;
 # this limits the number of connections needed to run the tests.
@@ -8,12 +7,12 @@
 # run tablespace by itself, and first, because it forces a checkpoint;
 # we'd prefer not to have checkpoints later in the tests because that
 # interferes with crash-recovery testing.
-# test: tablespace
+test: tablespace
 
 # ----------
 # The first group of parallel tests
 # ----------
-
+ignore: txid
 test: boolean char name varchar text int2 int4 int8 oid float4 float8 bit numeric txid uuid enum money rangetypes pg_lsn regproc
 
 # ----------
@@ -70,6 +69,7 @@ test: sanity_check
 # Note: the ignore: line does not run random, just mark it as ignorable
 # ----------
 ignore: random
+ignore: update
 test: select_into select_distinct select_distinct_on select_implicit select_having case aggregates transactions random portals arrays btree_index hash_index update delete namespace prepared_xacts
 test: subselect union join
 
@@ -97,6 +97,7 @@ test: publication subscription
 # ----------
 # Another group of parallel tests
 # ----------
+ignore: combocid
 test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock indirect_toast equivclass
 
 # ----------
@@ -109,8 +110,7 @@ test: json jsonb json_encoding jsonpath jsonpath_encoding jsonb_jsonpath
 # NB: temp.sql does a reconnect which transiently uses 2 connections,
 # so keep this parallel group to at most 19 tests
 # ----------
-test: plancache limit plpgsql copy2 temp domain rangefuncs prepare conversion truncate alter_table sequence polymorphism rowtypes returning largeobject xml
-test: with
+test: plancache limit plpgsql copy2 temp domain rangefuncs prepare conversion truncate alter_table sequence polymorphism rowtypes returning largeobject xml with
 
 # ----------
 # Another group of parallel tests
diff --git a/postprocessing.c b/postprocessing.c
@@ -557,7 +557,11 @@ aqo_ExecutorEnd(QueryDesc *queryDesc)
 		pfree_query_stat(stat);
 	}
 
+	/* Allow concurrent queries to update this feature space. */
 	LockRelease(&tag, ExclusiveLock, false);
+
+	cur_classes = list_delete_int(cur_classes, query_context.query_hash);
+
 	RemoveFromQueryEnv(queryDesc);
 
 end:
diff --git a/preprocessing.c b/preprocessing.c
@@ -61,6 +61,9 @@
 #include "access/table.h"
 #include "commands/extension.h"
 
+/* List of feature spaces, that are processing in this backend. */
+List *cur_classes = NIL;
+
 static bool isQueryUsingSystemRelation(Query *query);
 static bool isQueryUsingSystemRelation_walker(Node *node, void *context);
 
@@ -116,6 +119,7 @@ aqo_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	Datum		query_params[5];
 	bool		query_nulls[5] = {false, false, false, false, false};
 	LOCKTAG		tag;
+	MemoryContext oldCxt;
 
 	selectivity_cache_clear();
 
@@ -139,16 +143,25 @@ aqo_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		return call_default_planner(parse, cursorOptions, boundParams);
 	}
 
-	INSTR_TIME_SET_CURRENT(query_context.query_starttime);
-
 	query_context.query_hash = get_query_hash(parse, query_text);
 
-	if (query_is_deactivated(query_context.query_hash))
+	if (query_is_deactivated(query_context.query_hash) ||
+		list_member_int(cur_classes, query_context.query_hash))
 	{
+		/* Disable AQO for deactivated query or for query belonged to a
+		 * feature space, that is processing yet (disallow invalidation
+		 * recursion, as an example).
+		 */
 		disable_aqo_for_query();
 		return call_default_planner(parse, cursorOptions, boundParams);
 	}
 
+	oldCxt = MemoryContextSwitchTo(AQOMemoryContext);
+	cur_classes = lappend_int(cur_classes, query_context.query_hash);
+	MemoryContextSwitchTo(oldCxt);
+
+	INSTR_TIME_SET_CURRENT(query_context.query_starttime);
+
 	/*
 	 * find-add query and query text must be atomic operation to prevent
 	 * concurrent insertions.

Original file line number	Diff line number	Diff line change
`@@ -125,6 +125,12 @@ aqo_free_callback(ResourceReleasePhase phase,`
`125`	`125`	`pfree(query_text);`
`126`	`126`	`query_text = NULL;`
`127`	`127`	`}`
	`128`	`+`
	`129`	`+ if (isTopLevel)`
	`130`	`+ {`
	`131`	`+ list_free(cur_classes);`
	`132`	`+ cur_classes = NIL;`
	`133`	`+ }`
`128`	`134`	`}`
`129`	`135`
`130`	`136`	`void`