Raise AQO version to v1.6.

Rename a couple of UI functions:
1. aqo_enable_query -> aqo_enable_class
2. aqo_disable_query -> aqo_disable_class

Fix the bug of 1.5 with execution of "enable" routine from "disable" UI function.
Correct aqo_cleanup() return type:
It returns single set of values. So, we don't really needed all of the
materialization machinery. Just to form and return a tuple.

Author: danolivo

Makefile

@@ -1,7 +1,7 @@
 # contrib/aqo/Makefile
 
 EXTENSION = aqo
-EXTVERSION = 1.5
+EXTVERSION = 1.6
 PGFILEDESC = "AQO - Adaptive Query Optimization"
 MODULE_big = aqo
 OBJS = $(WIN32RES) \
@@ -23,7 +23,8 @@ EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/aqo.conf
 EXTRA_INSTALL = contrib/postgres_fdw contrib/pg_stat_statements
 
 DATA = aqo--1.0.sql aqo--1.0--1.1.sql aqo--1.1--1.2.sql aqo--1.2.sql \
-		aqo--1.2--1.3.sql aqo--1.3--1.4.sql aqo--1.4--1.5.sql
+		aqo--1.2--1.3.sql aqo--1.3--1.4.sql aqo--1.4--1.5.sql \
+		aqo--1.5--1.6.sql
 
 ifdef USE_PGXS
 PG_CONFIG ?= pg_config

aqo--1.5--1.6.sql

@@ -0,0 +1,32 @@
+/* contrib/aqo/aqo--1.5--1.6.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "ALTER EXTENSION aqo UPDATE TO '1.6'" to load this file. \quit
+
+DROP FUNCTION aqo_enable_query;
+DROP FUNCTION aqo_disable_query;
+DROP FUNCTION aqo_cleanup;
+
+CREATE FUNCTION aqo_enable_class(queryid bigint)
+RETURNS void
+AS 'MODULE_PATHNAME', 'aqo_enable_query'
+LANGUAGE C STRICT VOLATILE;
+
+CREATE FUNCTION aqo_disable_class(queryid bigint)
+RETURNS void
+AS 'MODULE_PATHNAME', 'aqo_disable_query'
+LANGUAGE C STRICT VOLATILE;
+
+--
+-- Remove unneeded rows from the AQO ML storage.
+-- For common feature space, remove rows from aqo_data only.
+-- For custom feature space - remove all rows related to the space from all AQO
+-- tables even if only one oid for one feature subspace of the space is illegal.
+-- Returns number of deleted rows from aqo_queries and aqo_data tables.
+--
+CREATE FUNCTION aqo_cleanup(OUT nfs integer, OUT nfss integer)
+RETURNS record
+AS 'MODULE_PATHNAME', 'aqo_cleanup'
+LANGUAGE C STRICT VOLATILE;
+COMMENT ON FUNCTION aqo_cleanup() IS
+'Remove unneeded rows from the AQO ML storage';

aqo.control

@@ -1,5 +1,5 @@
 # AQO extension
 comment = 'machine learning for cardinality estimation in optimizer'
-default_version = '1.5'
+default_version = '1.6'
 module_pathname = '$libdir/aqo'
 relocatable = true

expected/aqo_CVE-2020-14350.out

@@ -116,7 +116,7 @@ SHOW is_superuser;
  off
 (1 row)
 
-CREATE FUNCTION aqo_enable_query(hash bigint)
+CREATE FUNCTION aqo_enable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
@@ -125,18 +125,18 @@ $$ LANGUAGE plpgsql;
 RESET ROLE;
 -- Test result (error expected)
 CREATE EXTENSION aqo;
-ERROR:  function "aqo_enable_query" already exists with same argument types
+ERROR:  function "aqo_enable_class" already exists with same argument types
 SET ROLE regress_hacker;
-CREATE OR REPLACE FUNCTION aqo_enable_query(hash bigint)
+CREATE OR REPLACE FUNCTION aqo_enable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
   ALTER ROLE regress_hacker SUPERUSER;
 END
 $$ LANGUAGE plpgsql;
 RESET ROLE;
-SELECT aqo_enable_query(42);
- aqo_enable_query 
+SELECT aqo_enable_class(42);
+ aqo_enable_class 
 ------------------
 
 (1 row)
@@ -149,7 +149,7 @@ SHOW is_superuser;
 (1 row)
 
 RESET ROLE;
-DROP FUNCTION aqo_enable_query(bigint);
+DROP FUNCTION aqo_enable_class(bigint);
 DROP EXTENSION IF EXISTS aqo;
 NOTICE:  extension "aqo" does not exist, skipping
 -- Test 4
@@ -162,7 +162,7 @@ SHOW is_superuser;
  off
 (1 row)
 
-CREATE FUNCTION aqo_disable_query(hash bigint)
+CREATE FUNCTION aqo_disable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
@@ -171,18 +171,18 @@ $$ LANGUAGE plpgsql;
 RESET ROLE;
 -- Test result (error expected)
 CREATE EXTENSION aqo;
-ERROR:  function "aqo_disable_query" already exists with same argument types
+ERROR:  function "aqo_disable_class" already exists with same argument types
 SET ROLE regress_hacker;
-CREATE OR REPLACE FUNCTION aqo_disable_query(hash bigint)
+CREATE OR REPLACE FUNCTION aqo_disable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
   ALTER ROLE regress_hacker SUPERUSER;
 END
 $$ LANGUAGE plpgsql;
 RESET ROLE;
-SELECT aqo_disable_query(42);
- aqo_disable_query 
+SELECT aqo_disable_class(42);
+ aqo_disable_class 
 -------------------
 
 (1 row)
@@ -195,7 +195,7 @@ SHOW is_superuser;
 (1 row)
 
 RESET ROLE;
-DROP FUNCTION aqo_disable_query(bigint);
+DROP FUNCTION aqo_disable_class(bigint);
 DROP EXTENSION IF EXISTS aqo;
 NOTICE:  extension "aqo" does not exist, skipping
 -- Test 5

expected/gucs.out

@@ -107,10 +107,10 @@ SELECT obj_description('aqo_reset'::regproc::oid);
 (1 row)
 
 \df aqo_cleanup
-                                  List of functions
- Schema |    Name     |         Result data type         | Argument data types | Type 
---------+-------------+----------------------------------+---------------------+------
- public | aqo_cleanup | TABLE(nfs integer, nfss integer) |                     | func
+                                 List of functions
+ Schema |    Name     | Result data type |        Argument data types        | Type 
+--------+-------------+------------------+-----------------------------------+------
+ public | aqo_cleanup | record           | OUT nfs integer, OUT nfss integer | func
 (1 row)
 
 \df aqo_reset

expected/relocatable.out

@@ -80,9 +80,9 @@ ORDER BY (md5(query_text))
 /*
  * Below, we should check each UI function
  */
-SELECT aqo_disable_query(id) FROM (
+SELECT aqo_disable_class(id) FROM (
   SELECT queryid AS id FROM aqo_queries WHERE queryid <> 0) AS q1;
- aqo_disable_query 
+ aqo_disable_class 
 -------------------
 
 
@@ -93,13 +93,13 @@ ORDER BY (learn_aqo, use_aqo, auto_tuning);
  learn_aqo | use_aqo | auto_tuning 
 -----------+---------+-------------
  f         | f       | f
- t         | t       | f
- t         | t       | f
+ f         | f       | f
+ f         | f       | f
 (3 rows)
 
-SELECT aqo_enable_query(id) FROM (
+SELECT aqo_enable_class(id) FROM (
   SELECT queryid AS id FROM aqo_queries WHERE queryid <> 0) AS q1;
- aqo_enable_query 
+ aqo_enable_class 
 ------------------
 
 

sql/aqo_CVE-2020-14350.sql

@@ -103,7 +103,7 @@ ALTER ROLE regress_hacker NOSUPERUSER;
 SET ROLE regress_hacker;
 SHOW is_superuser;
 
-CREATE FUNCTION aqo_enable_query(hash bigint)
+CREATE FUNCTION aqo_enable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
@@ -115,7 +115,7 @@ RESET ROLE;
 CREATE EXTENSION aqo;
 
 SET ROLE regress_hacker;
-CREATE OR REPLACE FUNCTION aqo_enable_query(hash bigint)
+CREATE OR REPLACE FUNCTION aqo_enable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
@@ -124,13 +124,13 @@ END
 $$ LANGUAGE plpgsql;
 
 RESET ROLE;
-SELECT aqo_enable_query(42);
+SELECT aqo_enable_class(42);
 
 SET ROLE regress_hacker;
 SHOW is_superuser;
 
 RESET ROLE;
-DROP FUNCTION aqo_enable_query(bigint);
+DROP FUNCTION aqo_enable_class(bigint);
 DROP EXTENSION IF EXISTS aqo;
 
 -- Test 4
@@ -140,7 +140,7 @@ ALTER ROLE regress_hacker NOSUPERUSER;
 SET ROLE regress_hacker;
 SHOW is_superuser;
 
-CREATE FUNCTION aqo_disable_query(hash bigint)
+CREATE FUNCTION aqo_disable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
@@ -152,7 +152,7 @@ RESET ROLE;
 CREATE EXTENSION aqo;
 
 SET ROLE regress_hacker;
-CREATE OR REPLACE FUNCTION aqo_disable_query(hash bigint)
+CREATE OR REPLACE FUNCTION aqo_disable_class(hash bigint)
 RETURNS VOID
 AS $$
 BEGIN
@@ -161,13 +161,13 @@ END
 $$ LANGUAGE plpgsql;
 
 RESET ROLE;
-SELECT aqo_disable_query(42);
+SELECT aqo_disable_class(42);
 
 SET ROLE regress_hacker;
 SHOW is_superuser;
 
 RESET ROLE;
-DROP FUNCTION aqo_disable_query(bigint);
+DROP FUNCTION aqo_disable_class(bigint);
 DROP EXTENSION IF EXISTS aqo;
 
 -- Test 5

sql/relocatable.sql

@@ -39,11 +39,11 @@ ORDER BY (md5(query_text))
 /*
  * Below, we should check each UI function
  */
-SELECT aqo_disable_query(id) FROM (
+SELECT aqo_disable_class(id) FROM (
   SELECT queryid AS id FROM aqo_queries WHERE queryid <> 0) AS q1;
 SELECT learn_aqo, use_aqo, auto_tuning FROM test.aqo_queries
 ORDER BY (learn_aqo, use_aqo, auto_tuning);
-SELECT aqo_enable_query(id) FROM (
+SELECT aqo_enable_class(id) FROM (
   SELECT queryid AS id FROM aqo_queries WHERE queryid <> 0) AS q1;
 SELECT learn_aqo, use_aqo, auto_tuning FROM test.aqo_queries
 ORDER BY (learn_aqo, use_aqo, auto_tuning);

storage.c

@@ -2170,39 +2170,16 @@ aqo_cleanup(PG_FUNCTION_ARGS)
 {
 	int					fs_num;
 	int					fss_num;
-	ReturnSetInfo	   *rsinfo = (ReturnSetInfo *) fcinfo->resultinfo;
 	TupleDesc			tupDesc;
-	MemoryContext		per_query_ctx;
-	MemoryContext		oldcontext;
-	Tuplestorestate	   *tupstore;
+	HeapTuple			tuple;
+	Datum				result;
 	Datum				values[2];
 	bool				nulls[2] = {0, 0};
 
-	/* check to see if caller supports us returning a tuplestore */
-	if (rsinfo == NULL || !IsA(rsinfo, ReturnSetInfo))
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("set-valued function called in context that cannot accept a set")));
-	if (!(rsinfo->allowedModes & SFRM_Materialize))
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("materialize mode required, but it is not allowed in this context")));
-
-	/* Switch into long-lived context to construct returned data structures */
-	per_query_ctx = rsinfo->econtext->ecxt_per_query_memory;
-	oldcontext = MemoryContextSwitchTo(per_query_ctx);
-
-	/* Build a tuple descriptor for our result type */
 	if (get_call_result_type(fcinfo, NULL, &tupDesc) != TYPEFUNC_COMPOSITE)
 		elog(ERROR, "return type must be a row type");
-	Assert(tupDesc->natts == 2);
 
-	tupstore = tuplestore_begin_heap(true, false, work_mem);
-	rsinfo->returnMode = SFRM_Materialize;
-	rsinfo->setResult = tupstore;
-	rsinfo->setDesc = tupDesc;
-
-	MemoryContextSwitchTo(oldcontext);
+	Assert(tupDesc->natts == 2);
 
 	/*
 	 * Make forced cleanup: if at least one fss isn't actual, remove parent FS
@@ -2216,9 +2193,11 @@ aqo_cleanup(PG_FUNCTION_ARGS)
 
 	values[0] = Int32GetDatum(fs_num);
 	values[1] = Int32GetDatum(fss_num);
-	tuplestore_putvalues(tupstore, tupDesc, values, nulls);
-	tuplestore_donestoring(tupstore);
-	return (Datum) 0;
+
+	tuple = heap_form_tuple(tupDesc, values, nulls);
+	result = HeapTupleGetDatum(tuple);
+
+	PG_RETURN_DATUM(result);
 }
 
 /*