Merge branch 'PGPROEE9_6_aqo' into PGPROEE9_6

Author: vbwagner

contrib/aqo/Makefile

@@ -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/README.md

@@ -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/aqo.c

@@ -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.h

@@ -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/expected/aqo_manual.out renamed to contrib/aqo/expected/aqo_controlled.out

@@ -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_disabled.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_forced.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_intelligent.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/preprocessing.c

@@ -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/sql/aqo_manual.sql renamed to contrib/aqo/sql/aqo_controlled.sql

@@ -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_disabled.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_forced.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_intelligent.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;
 

contrib/aqo/storage.c

@@ -38,6 +38,7 @@ find_query(int query_hash,
 	Oid			query_index_rel_oid;
 	IndexScanDesc query_index_scan;
 	ScanKeyData key;
+	LOCKMODE	index_lock = AccessShareLock;
 
 	bool		find_ok = false;
 
@@ -51,7 +52,7 @@ find_query(int query_hash,
 	aqo_queries_table_rv = makeRangeVar("public", "aqo_queries", -1);
 	aqo_queries_heap = heap_openrv(aqo_queries_table_rv, heap_lock);
 
-	query_index_rel = index_open(query_index_rel_oid, heap_lock);
+	query_index_rel = index_open(query_index_rel_oid, index_lock);
 	query_index_scan = index_beginscan(
 									   aqo_queries_heap,
 									   query_index_rel,
@@ -76,7 +77,7 @@ find_query(int query_hash,
 						  search_values, search_nulls);
 
 	index_endscan(query_index_scan);
-	index_close(query_index_rel, heap_lock);
+	index_close(query_index_rel, index_lock);
 	heap_close(aqo_queries_heap, heap_lock);
 
 	return find_ok;
@@ -94,6 +95,7 @@ add_query(int query_hash, bool learn_aqo, bool use_aqo,
 	Relation	aqo_queries_heap;
 	HeapTuple	tuple;
 	LOCKMODE	heap_lock = RowExclusiveLock;
+	LOCKMODE	index_lock = RowExclusiveLock;
 
 	Datum		values[5];
 	bool		nulls[5] = {false, false, false, false, false};
@@ -113,7 +115,7 @@ add_query(int query_hash, bool learn_aqo, bool use_aqo,
 		disable_aqo_for_query();
 		return false;
 	}
-	query_index_rel = index_open(query_index_rel_oid, heap_lock);
+	query_index_rel = index_open(query_index_rel_oid, index_lock);
 
 	aqo_queries_table_rv = makeRangeVar("public", "aqo_queries", -1);
 	aqo_queries_heap = heap_openrv(aqo_queries_table_rv, heap_lock);
@@ -136,7 +138,7 @@ add_query(int query_hash, bool learn_aqo, bool use_aqo,
 	}
 	PG_END_TRY();
 
-	index_close(query_index_rel, heap_lock);
+	index_close(query_index_rel, index_lock);
 	heap_close(aqo_queries_heap, heap_lock);
 
 	CommandCounterIncrement();
@@ -158,6 +160,7 @@ update_query(int query_hash, bool learn_aqo, bool use_aqo,
 	Oid			query_index_rel_oid;
 	IndexScanDesc query_index_scan;
 	ScanKeyData key;
+	LOCKMODE	index_lock = RowExclusiveLock;
 
 	Datum		values[5];
 	bool		nulls[5] = {false, false, false, false, false};
@@ -173,7 +176,7 @@ update_query(int query_hash, bool learn_aqo, bool use_aqo,
 	aqo_queries_table_rv = makeRangeVar("public", "aqo_queries", -1);
 	aqo_queries_heap = heap_openrv(aqo_queries_table_rv, heap_lock);
 
-	query_index_rel = index_open(query_index_rel_oid, heap_lock);
+	query_index_rel = index_open(query_index_rel_oid, index_lock);
 	query_index_scan = index_beginscan(
 									   aqo_queries_heap,
 									   query_index_rel,
@@ -217,7 +220,7 @@ update_query(int query_hash, bool learn_aqo, bool use_aqo,
 	}
 
 	index_endscan(query_index_scan);
-	index_close(query_index_rel, heap_lock);
+	index_close(query_index_rel, index_lock);
 	heap_close(aqo_queries_heap, heap_lock);
 
 	CommandCounterIncrement();
@@ -236,6 +239,7 @@ add_query_text(int query_hash, const char *query_text)
 	Relation	aqo_query_texts_heap;
 	HeapTuple	tuple;
 	LOCKMODE	heap_lock = RowExclusiveLock;
+	LOCKMODE	index_lock = RowExclusiveLock;
 
 	Datum		values[2];
 	bool		nulls[2] = {false, false};
@@ -252,7 +256,7 @@ add_query_text(int query_hash, const char *query_text)
 		disable_aqo_for_query();
 		return false;
 	}
-	query_index_rel = index_open(query_index_rel_oid, heap_lock);
+	query_index_rel = index_open(query_index_rel_oid, index_lock);
 
 	aqo_query_texts_table_rv = makeRangeVar("public",
 											"aqo_query_texts",
@@ -280,7 +284,7 @@ add_query_text(int query_hash, const char *query_text)
 	PG_END_TRY();
 
 
-	index_close(query_index_rel, heap_lock);
+	index_close(query_index_rel, index_lock);
 	heap_close(aqo_query_texts_heap, heap_lock);
 
 	CommandCounterIncrement();
@@ -315,6 +319,7 @@ load_fss(int fss_hash, int ncols,
 	Oid			data_index_rel_oid;
 	IndexScanDesc data_index_scan;
 	ScanKeyData *key;
+	LOCKMODE	index_lock = AccessShareLock;
 
 	Datum		values[5];
 	bool		nulls[5];
@@ -331,7 +336,7 @@ load_fss(int fss_hash, int ncols,
 	aqo_data_table_rv = makeRangeVar("public", "aqo_data", -1);
 	aqo_data_heap = heap_openrv(aqo_data_table_rv, heap_lock);
 
-	data_index_rel = index_open(data_index_rel_oid, heap_lock);
+	data_index_rel = index_open(data_index_rel_oid, index_lock);
 	data_index_scan = index_beginscan(
 									  aqo_data_heap,
 									  data_index_rel,
@@ -380,7 +385,7 @@ load_fss(int fss_hash, int ncols,
 
 	index_endscan(data_index_scan);
 
-	index_close(data_index_rel, heap_lock);
+	index_close(data_index_rel, index_lock);
 	heap_close(aqo_data_heap, heap_lock);
 
 	pfree(key);
@@ -534,6 +539,7 @@ get_aqo_stat(int query_hash)
 	Oid			stat_index_rel_oid;
 	IndexScanDesc stat_index_scan;
 	ScanKeyData key;
+	LOCKMODE	index_lock = AccessShareLock;
 
 	Datum		values[9];
 	bool		nulls[9];
@@ -550,7 +556,7 @@ get_aqo_stat(int query_hash)
 	aqo_stat_table_rv = makeRangeVar("public", "aqo_query_stat", -1);
 	aqo_stat_heap = heap_openrv(aqo_stat_table_rv, heap_lock);
 
-	stat_index_rel = index_open(stat_index_rel_oid, heap_lock);
+	stat_index_rel = index_open(stat_index_rel_oid, index_lock);
 	stat_index_scan = index_beginscan(
 									  aqo_stat_heap,
 									  stat_index_rel,
@@ -586,7 +592,7 @@ get_aqo_stat(int query_hash)
 
 	index_endscan(stat_index_scan);
 
-	index_close(stat_index_rel, heap_lock);
+	index_close(stat_index_rel, index_lock);
 	heap_close(aqo_stat_heap, heap_lock);
 
 	return stat;
@@ -707,7 +713,7 @@ update_aqo_stat(int query_hash, QueryStat * stat)
 
 	index_endscan(stat_index_scan);
 
-	index_close(stat_index_rel, heap_lock);
+	index_close(stat_index_rel, index_lock);
 	heap_close(aqo_stat_heap, heap_lock);
 
 	CommandCounterIncrement();
@@ -839,6 +845,10 @@ my_simple_heap_update(Relation relation, ItemPointer otid, HeapTuple tup)
 			return false;
 			break;
 
+		case HeapTupleBeingUpdated:
+			return false;
+			break;
+
 		default:
 			elog(ERROR, "unrecognized heap_update status: %u", result);
 			break;