Merge branch 'PGPROEE9_6' into PGPROEE9_6_MULTIMASTER

Author: vbwagner

.gitlab-ci.yml

@@ -7,7 +7,7 @@ DATA = aqo--1.0.sql
 OBJS = aqo.o auto_tuning.o cardinality_estimation.o cardinality_hooks.o \
 hash.o machine_learning.o path_utils.o postprocessing.o preprocessing.o \
 selectivity_cache.o storage.o utils.o $(WIN32RES)
-REGRESS = aqo_disabled aqo_manual aqo_intelligent aqo_forced
+REGRESS = aqo_disabled aqo_controlled aqo_intelligent aqo_forced
 
 MODULE_big = aqo
 ifdef USE_PGXS

contrib/aqo/Makefile

@@ -21,7 +21,7 @@ of per-connection.
 ## Usage
 
 Note that the extension works bad with dynamically generated views. If they
-appear in workload, please use "aqo.mode='manual'".
+appear in workload, please use "aqo.mode='controlled'".
 
 This extension has intelligent self-tuning mode. If you want to rely completely
 on it, just add line "aqo.mode = 'intelligent'" into your postgresql.conf.
@@ -36,8 +36,8 @@ For handling workloads with dynamically generated query structures the forced
 mode "aqo.mode = 'forced'" is provided. We cannot guarantee performance
 improvement with this mode, but you may try it nevertheless.
 
-If you want to completely control how PostgreSQL optimizes queries, use manual
-mode "aqo.mode = 'manual'" and
+If you want to completely control how PostgreSQL optimizes queries, use controlled
+mode "aqo.mode = 'controlled'" and
 contrib/aqo/learn_queries.sh file_with_sql_queries.sql "psql -d YOUR_DATABASE"
 where file_with_sql_queries.sql is a textfile with queries on which AQO is
 supposed to learn. Please use only SELECT queries file_with_sql_queries.sql.

contrib/aqo/README.md

@@ -12,7 +12,7 @@ int			aqo_mode;
 static const struct config_enum_entry format_options[] = {
 	{"intelligent", AQO_MODE_INTELLIGENT, false},
 	{"forced", AQO_MODE_FORCED, false},
-	{"manual", AQO_MODE_MANUAL, false},
+	{"controlled", AQO_MODE_CONTROLLED, false},
 	{"disabled", AQO_MODE_DISABLED, false},
 	{NULL, 0, false}
 };
@@ -74,7 +74,7 @@ _PG_init(void)
 							 "Mode of aqo usage.",
 							 NULL,
 							 &aqo_mode,
-							 AQO_MODE_MANUAL,
+							 AQO_MODE_CONTROLLED,
 							 format_options,
 							 PGC_SUSET,
 							 0,

contrib/aqo/aqo.c

@@ -34,7 +34,7 @@
  * "forced" mode makes no difference between query types and use AQO for them
  * all in the similar way. It considers each new query type as linked to special
  * feature space called COMMON with hash 0.
- * "manual" mode ignores unknown query types. In this case AQO is completely
+ * "Controlled" mode ignores unknown query types. In this case AQO is completely
  * configured manually by user.
  * Current mode is stored in aqo.mode variable.
  *
@@ -148,7 +148,7 @@ typedef enum
 	/* Treats new query types as linked to the common feature space */
 	AQO_MODE_FORCED,
 	/* New query types are not linked with any feature space */
-	AQO_MODE_MANUAL,
+	AQO_MODE_CONTROLLED,
 	/* Aqo is disabled for all queries */
 	AQO_MODE_DISABLED,
 }	AQO_MODE;

contrib/aqo/aqo.h

@@ -26,7 +26,7 @@ AS (
 CREATE INDEX aqo_test2_idx_a ON aqo_test2 (a);
 ANALYZE aqo_test2;
 CREATE EXTENSION aqo;
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;
@@ -105,7 +105,7 @@ SELECT count(*) FROM tmp1;
 (1 row)
 
 DROP TABLE tmp1;
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 UPDATE aqo_queries SET auto_tuning=false;
 UPDATE aqo_queries SET learn_aqo=true;
 UPDATE aqo_queries SET use_aqo=false;

contrib/aqo/expected/aqo_manual.out renamed to contrib/aqo/expected/aqo_controlled.out

@@ -83,7 +83,7 @@ SELECT count(*) FROM tmp1;
 (1 row)
 
 DROP TABLE tmp1;
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 UPDATE aqo_queries SET learn_aqo = true, use_aqo = true, auto_tuning = false;
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;

contrib/aqo/expected/aqo_disabled.out

@@ -17,7 +17,7 @@ AS (
 CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 CREATE EXTENSION aqo;
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;

contrib/aqo/expected/aqo_forced.out

@@ -296,7 +296,7 @@ SELECT count(*) FROM tmp1;
 (1 row)
 
 DROP TABLE tmp1;
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 UPDATE aqo_queries SET learn_aqo = false, use_aqo = false, auto_tuning = false;
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;

contrib/aqo/expected/aqo_intelligent.out

@@ -26,7 +26,7 @@
  *		typing strategy by changing hash function.
  * 2. New query type proceeding. The handling policy for new query types is
  *		contained in variable 'aqo.mode'. It accepts three values:
- *		"intelligent", "forced", and "manual".
+ *		"intelligent", "forced", "controlled" and "disabled".
  *		Intelligent linking strategy means that for each new query type the new
  *		separate feature space is created. The hash of new feature space is
  *		set the same as the hash of new query type. Auto tuning is on by
@@ -35,10 +35,11 @@
  *		Forced linking strategy means that every new query type is linked to
  *		the common feature space with hash 0, but we don't memorize
  *		the hash and the settings for this query.
- *		Manual linking strategy means that new query types do not induce new
- *		feature spaces neither interact AQO somehow. In this mode the
+ *		Controlled linking strategy means that new query types do not induce
+ *		new feature spaces neither interact AQO somehow. In this mode the
  *		configuration of settings for different query types lies completely on
  *		user.
+ *		Disabled strategy means that AQO is disabled for all queries.
  * 3. For given query type we determine its query_hash, use_aqo, learn_aqo,
  *		fspace_hash and auto_tuning parameters.
  * 4. For given fspace_hash we may use its machine learning settings, but now
@@ -143,9 +144,9 @@ aqo_planner(Query *parse,
 				use_aqo = true;
 				auto_tuning = false;
 				fspace_hash = 0;
-				collect_stat = true;
+				collect_stat = false;
 				break;
-			case AQO_MODE_MANUAL:
+			case AQO_MODE_CONTROLLED:
 				adding_query = false;
 				learn_aqo = false;
 				use_aqo = false;

contrib/aqo/preprocessing.c

@@ -30,7 +30,7 @@ ANALYZE aqo_test2;
 
 CREATE EXTENSION aqo;
 
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0
@@ -75,7 +75,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
 SELECT count(*) FROM tmp1;
 DROP TABLE tmp1;
 
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 UPDATE aqo_queries SET auto_tuning=false;
 
 UPDATE aqo_queries SET learn_aqo=true;

contrib/aqo/sql/aqo_manual.sql renamed to contrib/aqo/sql/aqo_controlled.sql

@@ -53,7 +53,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;
 
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 
 UPDATE aqo_queries SET learn_aqo = true, use_aqo = true, auto_tuning = false;
 

contrib/aqo/sql/aqo_disabled.sql

@@ -20,7 +20,7 @@ ANALYZE aqo_test1;
 
 CREATE EXTENSION aqo;
 
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0

contrib/aqo/sql/aqo_forced.sql

@@ -147,7 +147,7 @@ WHERE t1.a = t2.b AND t2.a = t3.b AND t3.a = t4.b;
 SELECT count(*) FROM tmp1;
 DROP TABLE tmp1;
 
-SET aqo.mode = 'manual';
+SET aqo.mode = 'controlled';
 
 UPDATE aqo_queries SET learn_aqo = false, use_aqo = false, auto_tuning = false;