Cumulative commit induced by regression tests results.

1. Do learn data writings into service relations after the query end. But
for the full solution of invalidation messages infinity loop problem we need to
save all aqo data in a memory cache. Flushing the data into the disk need to do at
separate transaction.
2. Fix the bug than aqo modifies path_relids and path_clauses node fields during
learning. It was induced segfaults in the case, than the plan was stored into the plancache.
3. Now AQO add state info to EXPLAIN message in verbose mode only.
4. QueryContext was introduced. Now all the query-related aqo data links to the query by
query environment machinery. It is solves a learning problem if subqueries induced by top-level query.
5. Exclude 'SET STORAGE MAIN' definition for some columns of the aqo service relations. It is made
for regression test passing and may be reverted.
6. AQO tests are modified.
7. Suppress AQO in parallel mode. We made it because AQO writes data into service relations
during a parallel stage and break command counter synchronization.

Author: danolivo

aqo--1.0.sql

@@ -40,21 +40,6 @@ CREATE INDEX aqo_query_texts_query_hash_idx ON public.aqo_query_texts (query_has
 CREATE INDEX aqo_query_stat_idx ON public.aqo_query_stat (query_hash);
 CREATE INDEX aqo_fss_access_idx ON public.aqo_data (fspace_hash, fsspace_hash);
 
-ALTER TABLE public.aqo_data ALTER COLUMN features SET STORAGE MAIN;
-ALTER TABLE public.aqo_data ALTER COLUMN targets SET STORAGE MAIN;
-ALTER TABLE public.aqo_query_stat
-ALTER COLUMN execution_time_with_aqo SET STORAGE MAIN;
-ALTER TABLE public.aqo_query_stat
-ALTER COLUMN execution_time_without_aqo SET STORAGE MAIN;
-ALTER TABLE public.aqo_query_stat
-ALTER COLUMN planning_time_with_aqo SET STORAGE MAIN;
-ALTER TABLE public.aqo_query_stat
-ALTER COLUMN planning_time_without_aqo SET STORAGE MAIN;
-ALTER TABLE public.aqo_query_stat
-ALTER COLUMN cardinality_error_without_aqo SET STORAGE MAIN;
-ALTER TABLE public.aqo_query_stat
-ALTER COLUMN cardinality_error_with_aqo SET STORAGE MAIN;
-
 INSERT INTO public.aqo_queries VALUES (0, false, false, 0, false);
 INSERT INTO public.aqo_query_texts VALUES (0, 'COMMON feature space (do not delete!)');
 -- a virtual query for COMMON feature space

aqo.c

@@ -39,8 +39,9 @@ double		log_selectivity_lower_bound = -30;
  * Currently we use it only to store query_text string which is initialized
  * after a query parsing and is used during the query planning.
  */
-MemoryContext AQOMemoryContext;
-QueryContextData query_context;
+MemoryContext		AQOMemoryContext;
+QueryContextData	query_context;
+char				*query_text = NULL;
 
 /* Saved hook values */
 post_parse_analyze_hook_type				prev_post_parse_analyze_hook;

aqo.h

@@ -222,6 +222,7 @@ extern double log_selectivity_lower_bound;
 
 /* Parameters for current query */
 extern QueryContextData query_context;
+extern char				*query_text;
 
 /* Memory context for long-live data */
 extern MemoryContext AQOMemoryContext;

expected/aqo_controlled.out

@@ -199,8 +199,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
  Index Scan using aqo_test0_idx_a on aqo_test0
    Index Cond: (a < 3)
    Filter: ((b < 3) AND (c < 3) AND (d < 3))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0
@@ -210,8 +209,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
  Index Scan using aqo_test0_idx_a on aqo_test0
    Index Cond: (a < 5)
    Filter: ((b < 5) AND (c < 5) AND (d < 5))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN (COSTS FALSE)
 SELECT t1.a, t2.b FROM aqo_test0 AS t1, aqo_test0 AS t2
@@ -224,8 +222,7 @@ WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
          Filter: (b < 1)
    ->  Seq Scan on aqo_test0 t2
          Filter: ((c < 1) AND (d < 1))
- Using aqo: true
-(7 rows)
+(6 rows)
 
 EXPLAIN (COSTS FALSE)
 SELECT t1.a, t2.b FROM aqo_test1 AS t1, aqo_test0 AS t2
@@ -256,8 +253,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
                Filter: (c < 1)
    ->  Seq Scan on aqo_test0 t3
          Filter: ((b < 1) AND (d < 0))
- Using aqo: true
-(11 rows)
+(10 rows)
 
 EXPLAIN (COSTS FALSE)
 SELECT t1.a AS a, t2.a AS b, t3.a AS c
@@ -274,8 +270,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b;
                ->  Seq Scan on aqo_test1 t2
    ->  Hash
          ->  Seq Scan on aqo_test1 t3
- Using aqo: true
-(10 rows)
+(9 rows)
 
 EXPLAIN (COSTS FALSE)
 SELECT t1.a AS a, t2.a AS b, t3.a AS c

expected/aqo_disabled.out

@@ -92,8 +92,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.35 rows=3 width=16)
    Index Cond: (a < 3)
    Filter: ((b < 3) AND (c < 3) AND (d < 3))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT t1.a, t2.b, t3.c
 FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
@@ -110,8 +109,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
                Filter: (c < 1)
    ->  Seq Scan on aqo_test0 t3  (cost=0.00..41.02 rows=1 width=8)
          Filter: ((b < 1) AND (d < 0))
- Using aqo: true
-(11 rows)
+(10 rows)
 
 SET aqo.mode = 'disabled';
 EXPLAIN SELECT * FROM aqo_test0

expected/aqo_forced.out

@@ -65,8 +65,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
  Index Scan using aqo_test0_idx_a on aqo_test0
    Index Cond: (a < 3)
    Filter: ((b < 3) AND (c < 3) AND (d < 3))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0
@@ -76,8 +75,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
  Index Scan using aqo_test0_idx_a on aqo_test0
    Index Cond: (a < 5)
    Filter: ((b < 5) AND (c < 5) AND (d < 5))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 DROP INDEX aqo_test0_idx_a;
 DROP TABLE aqo_test0;

expected/aqo_intelligent.out

@@ -410,8 +410,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.35 rows=3 width=16)
    Index Cond: (a < 3)
    Filter: ((b < 3) AND (c < 3) AND (d < 3))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
@@ -420,8 +419,7 @@ WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.38 rows=4 width=16)
    Index Cond: (a < 4)
    Filter: ((b < 4) AND (c < 4) AND (d < 4))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
@@ -430,8 +428,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.40 rows=5 width=16)
    Index Cond: (a < 5)
    Filter: ((b < 5) AND (c < 5) AND (d < 5))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT t1.a, t2.b FROM aqo_test0 AS t1, aqo_test0 AS t2
 WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
@@ -443,8 +440,7 @@ WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
          Filter: (b < 1)
    ->  Seq Scan on aqo_test0 t2  (cost=0.00..41.02 rows=1 width=4)
          Filter: ((c < 1) AND (d < 1))
- Using aqo: true
-(7 rows)
+(6 rows)
 
 EXPLAIN SELECT t1.a, t2.b FROM aqo_test1 AS t1, aqo_test0 AS t2
 WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
@@ -456,8 +452,7 @@ WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
    ->  Index Scan using aqo_test0_idx_a on aqo_test0 t2  (cost=0.28..8.30 rows=1 width=8)
          Index Cond: (a = t1.a)
          Filter: ((b < 1) AND (c < 1) AND (d < 1))
- Using aqo: true
-(7 rows)
+(6 rows)
 
 EXPlAIN SELECT t1.a, t2.b, t3.c
 FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
@@ -474,8 +469,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
                Filter: (c < 1)
    ->  Seq Scan on aqo_test0 t3  (cost=0.00..41.02 rows=1 width=8)
          Filter: ((b < 1) AND (d < 0))
- Using aqo: true
-(11 rows)
+(10 rows)
 
 EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c
 FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3
@@ -491,8 +485,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b;
                ->  Seq Scan on aqo_test1 t2  (cost=0.00..1.20 rows=20 width=8)
    ->  Hash  (cost=1.20..1.20 rows=20 width=8)
          ->  Seq Scan on aqo_test1 t3  (cost=0.00..1.20 rows=20 width=8)
- Using aqo: true
-(10 rows)
+(9 rows)
 
 EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c, t4.a AS d
 FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3, aqo_test1 AS t4
@@ -512,8 +505,38 @@ WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
                ->  Seq Scan on aqo_test1 t3  (cost=0.00..1.20 rows=20 width=8)
    ->  Hash  (cost=1.20..1.20 rows=20 width=8)
          ->  Seq Scan on aqo_test1 t4  (cost=0.00..1.20 rows=20 width=8)
+(13 rows)
+
+EXPLAIN verbose SELECT t1.a AS a, t2.a AS b, t3.a AS c, t4.a AS d
+FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3, aqo_test1 AS t4
+WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
+                                         QUERY PLAN                                         
+--------------------------------------------------------------------------------------------
+ Hash Join  (cost=4.35..6.37 rows=20 width=16)
+   Output: t1.a, t2.a, t3.a, t4.a
+   Hash Cond: (t3.a = t4.b)
+   ->  Hash Join  (cost=2.90..4.65 rows=20 width=12)
+         Output: t1.a, t2.a, t3.a
+         Hash Cond: (t2.a = t3.b)
+         ->  Hash Join  (cost=1.45..2.92 rows=20 width=8)
+               Output: t1.a, t2.a
+               Hash Cond: (t1.a = t2.b)
+               ->  Seq Scan on public.aqo_test1 t1  (cost=0.00..1.20 rows=20 width=4)
+                     Output: t1.a, t1.b
+               ->  Hash  (cost=1.20..1.20 rows=20 width=8)
+                     Output: t2.a, t2.b
+                     ->  Seq Scan on public.aqo_test1 t2  (cost=0.00..1.20 rows=20 width=8)
+                           Output: t2.a, t2.b
+         ->  Hash  (cost=1.20..1.20 rows=20 width=8)
+               Output: t3.a, t3.b
+               ->  Seq Scan on public.aqo_test1 t3  (cost=0.00..1.20 rows=20 width=8)
+                     Output: t3.a, t3.b
+   ->  Hash  (cost=1.20..1.20 rows=20 width=8)
+         Output: t4.a, t4.b
+         ->  Seq Scan on public.aqo_test1 t4  (cost=0.00..1.20 rows=20 width=8)
+               Output: t4.a, t4.b
  Using aqo: true
-(14 rows)
+(24 rows)
 
 DROP INDEX aqo_test0_idx_a;
 DROP TABLE aqo_test0;

expected/aqo_learn.out

@@ -329,8 +329,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.35 rows=3 width=16)
    Index Cond: (a < 3)
    Filter: ((b < 3) AND (c < 3) AND (d < 3))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
@@ -339,8 +338,7 @@ WHERE a < 4 AND b < 4 AND c < 4 AND d < 4;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.38 rows=4 width=16)
    Index Cond: (a < 4)
    Filter: ((b < 4) AND (c < 4) AND (d < 4))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
@@ -349,8 +347,7 @@ WHERE a < 5 AND b < 5 AND c < 5 AND d < 5;
  Index Scan using aqo_test0_idx_a on aqo_test0  (cost=0.28..8.40 rows=5 width=16)
    Index Cond: (a < 5)
    Filter: ((b < 5) AND (c < 5) AND (d < 5))
- Using aqo: true
-(4 rows)
+(3 rows)
 
 EXPLAIN SELECT t1.a, t2.b FROM aqo_test0 AS t1, aqo_test0 AS t2
 WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
@@ -362,8 +359,7 @@ WHERE t1.a < 1 AND t1.b < 1 AND t2.c < 1 AND t2.d < 1;
          Filter: (b < 1)
    ->  Seq Scan on aqo_test0 t2  (cost=0.00..41.02 rows=1 width=4)
          Filter: ((c < 1) AND (d < 1))
- Using aqo: true
-(7 rows)
+(6 rows)
 
 EXPLAIN SELECT t1.a, t2.b FROM aqo_test1 AS t1, aqo_test0 AS t2
 WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
@@ -375,8 +371,7 @@ WHERE t1.a < 1 AND t2.b < 1 AND t2.c < 1 AND t2.d < 1 AND t1.a = t2.a;
    ->  Index Scan using aqo_test0_idx_a on aqo_test0 t2  (cost=0.28..8.30 rows=1 width=8)
          Index Cond: (a = t1.a)
          Filter: ((b < 1) AND (c < 1) AND (d < 1))
- Using aqo: true
-(7 rows)
+(6 rows)
 
 EXPlAIN SELECT t1.a, t2.b, t3.c
 FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
@@ -393,8 +388,7 @@ WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b =
                Filter: (c < 1)
    ->  Seq Scan on aqo_test0 t3  (cost=0.00..41.02 rows=1 width=8)
          Filter: ((b < 1) AND (d < 0))
- Using aqo: true
-(11 rows)
+(10 rows)
 
 EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c
 FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3
@@ -410,8 +404,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b;
                ->  Seq Scan on aqo_test1 t2  (cost=0.00..1.20 rows=20 width=8)
    ->  Hash  (cost=1.20..1.20 rows=20 width=8)
          ->  Seq Scan on aqo_test1 t3  (cost=0.00..1.20 rows=20 width=8)
- Using aqo: true
-(10 rows)
+(9 rows)
 
 EXPLAIN SELECT t1.a AS a, t2.a AS b, t3.a AS c, t4.a AS d
 FROM aqo_test1 AS t1, aqo_test1 AS t2, aqo_test1 AS t3, aqo_test1 AS t4
@@ -431,8 +424,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
                ->  Seq Scan on aqo_test1 t3  (cost=0.00..1.20 rows=20 width=8)
    ->  Hash  (cost=1.20..1.20 rows=20 width=8)
          ->  Seq Scan on aqo_test1 t4  (cost=0.00..1.20 rows=20 width=8)
- Using aqo: true
-(14 rows)
+(13 rows)
 
 DROP INDEX aqo_test0_idx_a;
 DROP TABLE aqo_test0;

expected/schema.out

@@ -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;