postgrespro
diff --git a/‎expected/schema.out
Lines changed: 18 additions & 15 deletions b/‎expected/schema.out
Lines changed: 18 additions & 15 deletions
diff --git a/‎preprocessing.c
Lines changed: 1 addition & 0 deletions b/‎preprocessing.c
Lines changed: 1 addition & 0 deletions
diff --git a/‎sql/schema.sql
Lines changed: 7 additions & 3 deletions b/‎sql/schema.sql
Lines changed: 7 additions & 3 deletions
diff --git a/‎storage.c
Lines changed: 4 additions & 0 deletions b/‎storage.c
Lines changed: 4 additions & 0 deletions
@@ -21,23 +21,26 @@ SELECT * FROM test;
   1 | string
 (1 row)
 
-SELECT * FROM public.aqo_query_texts;
- query_hash |                 query_text                 
-------------+--------------------------------------------
-          0 | COMMON feature space (do not delete!)
- 1136691690 | INSERT INTO test (data) VALUES ('string');
-  868705076 | SELECT * FROM test;
-  826229959 | SELECT * FROM public.aqo_query_texts;
+-- Check AQO service relations state after some manipulations
+-- Exclude fields with hash values from the queries. Hash is depend on
+-- nodefuncs code which is highly PostgreSQL version specific.
+SELECT query_text FROM public.aqo_query_texts;
+                   query_text                   
+------------------------------------------------
+ COMMON feature space (do not delete!)
+ INSERT INTO test (data) VALUES ('string');
+ SELECT * FROM test;
+ SELECT query_text FROM public.aqo_query_texts;
 (4 rows)
 
-SELECT * FROM public.aqo_queries;
- query_hash | learn_aqo | use_aqo | fspace_hash | auto_tuning 
-------------+-----------+---------+-------------+-------------
-          0 | f         | f       |           0 | f
- 1136691690 | t         | f       |  1136691690 | t
-  868705076 | t         | f       |   868705076 | t
-  826229959 | t         | f       |   826229959 | t
- 2145866904 | t         | f       |  2145866904 | t
+SELECT learn_aqo, use_aqo, auto_tuning FROM public.aqo_queries;
+ learn_aqo | use_aqo | auto_tuning 
+-----------+---------+-------------
+ f         | f       | f
+ t         | f       | t
+ t         | f       | t
+ t         | f       | t
+ t         | f       | t
 (5 rows)
 
 DROP SCHEMA IF EXISTS test1 CASCADE;
 
@@ -122,6 +122,7 @@ aqo_planner(Query *parse,
 				strlen(CREATE_EXTENSION_STARTSTRING_0)) == 0 ||
 		strncmp(query_text, CREATE_EXTENSION_STARTSTRING_1,
 				strlen(CREATE_EXTENSION_STARTSTRING_1)) == 0 ||
+		IsInParallelMode() ||
 		aqo_mode == AQO_MODE_DISABLED || isQueryUsingSystemRelation(parse))
 	{
 		disable_aqo_for_query();
 
@@ -15,8 +15,12 @@ SET aqo.mode = 'intelligent';
 
 CREATE TABLE test (id SERIAL, data TEXT);
 INSERT INTO test (data) VALUES ('string');
-
 SELECT * FROM test;
-SELECT * FROM public.aqo_query_texts;
-SELECT * FROM public.aqo_queries;
+
+-- Check AQO service relations state after some manipulations
+-- Exclude fields with hash values from the queries. Hash is depend on
+-- nodefuncs code which is highly PostgreSQL version specific.
+SELECT query_text FROM public.aqo_query_texts;
+SELECT learn_aqo, use_aqo, auto_tuning FROM public.aqo_queries;
+
 DROP SCHEMA IF EXISTS test1 CASCADE;
@@ -146,6 +146,7 @@ add_query(int query_hash, bool learn_aqo, bool use_aqo,
 	{
 		CommandCounterIncrement();
 		simple_heap_delete(aqo_queries_heap, &(tuple->t_self));
+		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
@@ -289,6 +290,7 @@ add_query_text(int query_hash, const char *query_text)
 	{
 		CommandCounterIncrement();
 		simple_heap_delete(aqo_query_texts_heap, &(tuple->t_self));
+		PG_RE_THROW();
 	}
 	PG_END_TRY();
 
@@ -480,6 +482,7 @@ update_fss(int fss_hash, int nrows, int ncols,
 		{
 			CommandCounterIncrement();
 			simple_heap_delete(aqo_data_heap, &(tuple->t_self));
+			PG_RE_THROW();
 		}
 		PG_END_TRY();
 	}
@@ -676,6 +679,7 @@ update_aqo_stat(int query_hash, QueryStat *stat)
 		{
 			CommandCounterIncrement();
 			simple_heap_delete(aqo_stat_heap, &(tuple->t_self));
+			PG_RE_THROW();
 		}
 		PG_END_TRY();
 	}
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,7 @@ aqo_planner(Query *parse,`
`122`	`122`	`strlen(CREATE_EXTENSION_STARTSTRING_0)) == 0 \|\|`
`123`	`123`	`strncmp(query_text, CREATE_EXTENSION_STARTSTRING_1,`
`124`	`124`	`strlen(CREATE_EXTENSION_STARTSTRING_1)) == 0 \|\|`
	`125`	`+ IsInParallelMode() \|\|`
`125`	`126`	`aqo_mode == AQO_MODE_DISABLED \|\| isQueryUsingSystemRelation(parse))`
`126`	`127`	`{`
`127`	`128`	`disable_aqo_for_query();`
Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,7 @@ add_query(int query_hash, bool learn_aqo, bool use_aqo,`
`146`	`146`	`{`
`147`	`147`	`CommandCounterIncrement();`
`148`	`148`	`simple_heap_delete(aqo_queries_heap, &(tuple->t_self));`
	`149`	`+ PG_RE_THROW();`
`149`	`150`	`}`
`150`	`151`	`PG_END_TRY();`
`151`	`152`
`@@ -289,6 +290,7 @@ add_query_text(int query_hash, const char *query_text)`
`289`	`290`	`{`
`290`	`291`	`CommandCounterIncrement();`
`291`	`292`	`simple_heap_delete(aqo_query_texts_heap, &(tuple->t_self));`
	`293`	`+ PG_RE_THROW();`
`292`	`294`	`}`
`293`	`295`	`PG_END_TRY();`
`294`	`296`
`@@ -480,6 +482,7 @@ update_fss(int fss_hash, int nrows, int ncols,`
`480`	`482`	`{`
`481`	`483`	`CommandCounterIncrement();`
`482`	`484`	`simple_heap_delete(aqo_data_heap, &(tuple->t_self));`
	`485`	`+ PG_RE_THROW();`
`483`	`486`	`}`
`484`	`487`	`PG_END_TRY();`
`485`	`488`	`}`
`@@ -676,6 +679,7 @@ update_aqo_stat(int query_hash, QueryStat *stat)`
`676`	`679`	`{`
`677`	`680`	`CommandCounterIncrement();`
`678`	`681`	`simple_heap_delete(aqo_stat_heap, &(tuple->t_self));`
	`682`	`+ PG_RE_THROW();`
`679`	`683`	`}`
`680`	`684`	`PG_END_TRY();`
`681`	`685`	`}`