Second stage of arrangement with stable15

Author: danolivo

Diff for: aqo.c

@@ -37,7 +37,7 @@ void _PG_init(void);
 #define AQO_MODULE_MAGIC	(1234)
 
 /* Strategy of determining feature space for new queries. */
-int		aqo_mode;
+int		aqo_mode = AQO_MODE_CONTROLLED;
 bool	force_collect_stat;
 
 /*

Diff for: aqo_shared.c

@@ -26,8 +26,8 @@ shmem_startup_hook_type prev_shmem_startup_hook = NULL;
 AQOSharedState *aqo_state = NULL;
 HTAB *fss_htab = NULL;
 static int aqo_htab_max_items = 1000;
-int fs_max_items = 1; /* Max number of different feature spaces in ML model */
-int fss_max_items = 1; /* Max number of different feature subspaces in ML model */
+int fs_max_items = 10000; /* Max number of different feature spaces in ML model */
+int fss_max_items = 100000; /* Max number of different feature subspaces in ML model */
 static uint32 temp_storage_size = 1024 * 1024 * 10; /* Storage size, in bytes */
 static dsm_segment *seg = NULL;
 

Diff for: expected/relocatable.out

@@ -114,9 +114,9 @@ ORDER BY (learn_aqo, use_aqo, auto_tuning);
  t         | t       | f
 (3 rows)
 
+RESET search_path;
 DROP TABLE test CASCADE;
 DROP SCHEMA IF EXISTS test CASCADE;
 NOTICE:  drop cascades to extension aqo
 DROP EXTENSION IF EXISTS aqo CASCADE;
 NOTICE:  extension "aqo" does not exist, skipping
-RESET search_path;

Diff for: expected/statement_timeout.out

@@ -111,12 +111,12 @@ SELECT check_estimated_rows('SELECT *, pg_sleep(1) FROM t;');
                     5
 (1 row)
 
-DROP TABLE t;
 SELECT 1 FROM aqo_reset();
  ?column? 
 ----------
         1
 (1 row)
 
+DROP TABLE t;
 DROP EXTENSION aqo;
 DROP FUNCTION check_estimated_rows;

Diff for: expected/unsupported.out

@@ -43,8 +43,8 @@ EXPLAIN (COSTS OFF)
 (11 rows)
 
 SELECT str FROM expln('
-  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
-    SELECT * FROM t GROUP BY (x) HAVING x > 3;
+EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+	SELECT * FROM t GROUP BY (x) HAVING x > 3;
 ') AS str WHERE str NOT LIKE '%Memory Usage%';
                       str                      
 -----------------------------------------------
@@ -586,10 +586,6 @@ ORDER BY (md5(query_text),error) DESC;
        |         SELECT count(*) FROM t WHERE                                                          +
        |                 x = (SELECT avg(x) FROM t t0 WHERE t0.x = t.x + 21) OR                        +
        |                 x IN (SELECT avg(x) FROM t t0 WHERE t0.x = t.x + 21);
- 0.106 |                                                                                               +
-       |   EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)                                       +
-       |     SELECT * FROM t GROUP BY (x) HAVING x > 3;                                                +
-       | 
  0.454 | SELECT count(*) FROM (SELECT x, y FROM t1 GROUP BY GROUPING SETS ((x,y), (x), (y), ())) AS q1;
  0.000 | SELECT count(*) FROM (                                                                        +
        |         SELECT count(*) AS x FROM (                                                           +
@@ -602,6 +598,10 @@ ORDER BY (md5(query_text),error) DESC;
  0.000 | EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)                                         +
        |         SELECT count(*) FROM t WHERE (SELECT avg(x) FROM t t0 WHERE t0.x = t.x) =             +
        |         (SELECT avg(x) FROM t t0 WHERE t0.x = t.x);
+ 0.106 |                                                                                               +
+       | EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)                                         +
+       |         SELECT * FROM t GROUP BY (x) HAVING x > 3;                                            +
+       | 
  0.000 | SELECT count(*) FROM                                                                          +
        |         (SELECT * FROM t WHERE x % 3 < (SELECT avg(x) FROM t t0 WHERE t0.x = t.x)) AS q1      +
        |                 JOIN                                                                          +

Diff for: postprocessing.c

@@ -18,8 +18,6 @@
 
 #include "postgres.h"
 
-#include "aqo.h"
-
 #include "access/parallel.h"
 #include "optimizer/optimizer.h"
 #include "postgres_fdw.h"

Diff for: preprocessing.c

@@ -67,7 +67,6 @@
 #include "preprocessing.h"
 #include "storage.h"
 
-
 /* List of feature spaces, that are processing in this backend. */
 List *cur_classes = NIL;
 

Diff for: sql/relocatable.sql

@@ -48,7 +48,7 @@ SELECT aqo_enable_query(id) FROM (
 SELECT learn_aqo, use_aqo, auto_tuning FROM test.aqo_queries
 ORDER BY (learn_aqo, use_aqo, auto_tuning);
 
+RESET search_path;
 DROP TABLE test CASCADE;
 DROP SCHEMA IF EXISTS test CASCADE;
 DROP EXTENSION IF EXISTS aqo CASCADE;
-RESET search_path;

Diff for: sql/statement_timeout.sql

@@ -60,7 +60,7 @@ SET statement_timeout = 5500;
 SELECT *, pg_sleep(1) FROM t; -- Get reliable data
 SELECT check_estimated_rows('SELECT *, pg_sleep(1) FROM t;');
 
-DROP TABLE t;
 SELECT 1 FROM aqo_reset();
+DROP TABLE t;
 DROP EXTENSION aqo;
 DROP FUNCTION check_estimated_rows;

Diff for: sql/unsupported.sql

@@ -27,9 +27,10 @@ ANALYZE t, t1;
 SELECT count(*) FROM (SELECT * FROM t GROUP BY (x) HAVING x > 3) AS q1;
 EXPLAIN (COSTS OFF)
 	SELECT count(*) FROM (SELECT * FROM t GROUP BY (x) HAVING x > 3) AS q1;
+
 SELECT str FROM expln('
-  EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
-    SELECT * FROM t GROUP BY (x) HAVING x > 3;
+EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
+	SELECT * FROM t GROUP BY (x) HAVING x > 3;
 ') AS str WHERE str NOT LIKE '%Memory Usage%';
 
 --