By default, feature space should be equal to query_hash: minor fix and a set

of regression tests.

Author: danolivo

expected/aqo_disabled.out

@@ -16,6 +16,59 @@ AS (
 ) INSERT INTO aqo_test1 (SELECT * FROM t);
 CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
+CREATE EXTENSION aqo;
+SET aqo.mode = 'controlled';
+CREATE TABLE tmp1 AS SELECT * FROM aqo_test0
+WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
+SELECT count(*) FROM tmp1;
+count
+-------
+3
+(1 row)
+
+DROP TABLE tmp1;
+CREATE TABLE tmp1 AS SELECT t1.a, t2.b, t3.c
+FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
+WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
+SELECT count(*) FROM tmp1;
+count
+-------
+0
+(1 row)
+
+DROP TABLE tmp1;
+EXPLAIN SELECT * FROM aqo_test0
+WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
+QUERY PLAN
+----------------------------------------------------------------------------------
+Index Scan using aqo_test0_idx_a on aqo_test0 (cost=0.28..8.35 rows=1 width=16)
+Index Cond: (a < 3)
+Filter: ((b < 3) AND (c < 3) AND (d < 3))
+(3 rows)
+
+EXPLAIN SELECT t1.a, t2.b, t3.c
+FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
+WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
+QUERY PLAN
+------------------------------------------------------------------------------------------------
+Nested Loop (cost=0.28..50.59 rows=1 width=12)
+Join Filter: (t1.b = t3.b)
+-> Nested Loop (cost=0.28..9.56 rows=1 width=12)
+-> Seq Scan on aqo_test1 t1 (cost=0.00..1.25 rows=1 width=8)
+Filter: (a < 1)
+-> 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: (c < 1)
+-> Seq Scan on aqo_test0 t3 (cost=0.00..41.02 rows=1 width=8)
+Filter: ((b < 1) AND (d < 0))
+(10 rows)
+
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
+count
+-------
+0
+(1 row)
+
 SET aqo.mode = 'disabled';
 CREATE TABLE tmp1 AS SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
@@ -62,7 +115,12 @@ 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: ((b < 1) AND (d < 0))
 (10 rows)
 
-CREATE EXTENSION aqo;
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
+count
+-------
+0
+(1 row)
+
 SET aqo.mode = 'intelligent';
 CREATE TABLE tmp1 AS SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
@@ -83,6 +141,12 @@ SELECT count(*) FROM tmp1;
 (1 row)
 
 DROP TABLE tmp1;
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
+count
+-------
+0
+(1 row)
+
 SET aqo.mode = 'controlled';
 UPDATE aqo_queries SET learn_aqo = true, use_aqo = true, auto_tuning = false;
 EXPLAIN SELECT * FROM aqo_test0
@@ -111,6 +175,12 @@ 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: ((b < 1) AND (d < 0))
 (10 rows)
 
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
+count
+-------
+0
+(1 row)
+
 SET aqo.mode = 'disabled';
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
@@ -138,6 +208,12 @@ 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: ((b < 1) AND (d < 0))
 (10 rows)
 
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
+count
+-------
+0
+(1 row)
+
 DROP EXTENSION aqo;
 DROP INDEX aqo_test0_idx_a;
 DROP TABLE aqo_test0;

preprocessing.c

@@ -172,6 +172,9 @@ aqo_planner(Query *parse,
 selectivity_cache_clear();
 query_context.query_hash = get_query_hash(parse, query_string);
 
+/* By default, they should be equal */
+query_context.fspace_hash = query_context.query_hash;
+
 if (query_is_deactivated(query_context.query_hash) ||
 list_member_uint64(cur_classes,query_context.query_hash))
 {
@@ -211,7 +214,6 @@ aqo_planner(Query *parse,
 query_context.adding_query = true;
 query_context.learn_aqo = true;
 query_context.use_aqo = false;
-query_context.fspace_hash = query_context.query_hash;
 query_context.auto_tuning = true;
 query_context.collect_stat = true;
 break;
@@ -220,7 +222,7 @@ aqo_planner(Query *parse,
 query_context.learn_aqo = true;
 query_context.use_aqo = true;
 query_context.auto_tuning = false;
-query_context.fspace_hash = 0;
+query_context.fspace_hash = 0; /* Use common feature space */
 query_context.collect_stat = false;
 break;
 case AQO_MODE_CONTROLLED:
@@ -239,7 +241,6 @@ aqo_planner(Query *parse,
 query_context.adding_query = true;
 query_context.learn_aqo = true;
 query_context.use_aqo = true;
-query_context.fspace_hash = query_context.query_hash;
 query_context.auto_tuning = false;
 query_context.collect_stat = true;
 break;
@@ -287,7 +288,6 @@ aqo_planner(Query *parse,
 * suppressed manually) and collect stats.
 */
 query_context.collect_stat = true;
-query_context.fspace_hash = query_context.query_hash;
 break;
 
 case AQO_MODE_INTELLIGENT:
@@ -331,14 +331,11 @@ aqo_planner(Query *parse,
 }
 
 if (force_collect_stat)
-{
 /*
 * If this GUC is set, AQO will analyze query results and collect
 * query execution statistics in any mode.
 */
 query_context.collect_stat = true;
-query_context.fspace_hash = query_context.query_hash;
-}
 
 if (!IsQueryDisabled())
 /* It's good place to set timestamp of start of a planning process. */

sql/aqo_disabled.sql

@@ -17,6 +17,25 @@ AS (
 ) INSERT INTO aqo_test1 (SELECT * FROM t);
 CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
+CREATE EXTENSION aqo;
+
+SET aqo.mode = 'controlled';
+
+CREATE TABLE tmp1 AS SELECT * FROM aqo_test0
+WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
+SELECT count(*) FROM tmp1;
+DROP TABLE tmp1;
+CREATE TABLE tmp1 AS SELECT t1.a, t2.b, t3.c
+FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
+WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
+SELECT count(*) FROM tmp1;
+DROP TABLE tmp1;
+EXPLAIN SELECT * FROM aqo_test0
+WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
+EXPLAIN SELECT t1.a, t2.b, t3.c
+FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
+WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
 
 SET aqo.mode = 'disabled';
 
@@ -38,8 +57,7 @@ EXPLAIN SELECT t1.a, t2.b, t3.c
 FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
 WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
 
-CREATE EXTENSION aqo;
-
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
 SET aqo.mode = 'intelligent';
 
 CREATE TABLE tmp1 AS SELECT * FROM aqo_test0
@@ -53,6 +71,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 =
 SELECT count(*) FROM tmp1;
 DROP TABLE tmp1;
 
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
 SET aqo.mode = 'controlled';
 
 UPDATE aqo_queries SET learn_aqo = true, use_aqo = true, auto_tuning = false;
@@ -64,6 +83,7 @@ EXPLAIN SELECT t1.a, t2.b, t3.c
 FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
 WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
 
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
 SET aqo.mode = 'disabled';
 
 EXPLAIN SELECT * FROM aqo_test0
@@ -72,6 +92,7 @@ WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
 EXPLAIN SELECT t1.a, t2.b, t3.c
 FROM aqo_test1 AS t1, aqo_test0 AS t2, aqo_test0 AS t3
 WHERE t1.a < 1 AND t3.b < 1 AND t2.c < 1 AND t3.d < 0 AND t1.a = t2.a AND t1.b = t3.b;
+SELECT count(*) FROM aqo_queries WHERE query_hash <> fspace_hash; -- Should be zero
 
 DROP EXTENSION aqo;