Arrange code with specifics of PG15.

danolivo · danolivo · commit e8633ee6caa6 · 2022-09-07T10:27:29.000+05:00
diff --git a/aqo--1.4--1.5.sql b/aqo--1.4--1.5.sql
@@ -143,8 +143,8 @@ COMMENT ON FUNCTION aqo_drop_class(bigint) IS
 -- 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 OR REPLACE FUNCTION aqo_cleanup(OUT nfs integer, OUT nfss integer)
-AS 'MODULE_PATHNAME', 'aqo_cleanup'
+CREATE OR REPLACE FUNCTION aqo_cleanup()
+RETURNS TABLE(nfs integer, nfss integer) AS 'MODULE_PATHNAME', 'aqo_cleanup'
 LANGUAGE C STRICT VOLATILE;
 COMMENT ON FUNCTION aqo_cleanup() IS
 'Remove unneeded rows from the AQO ML storage';
diff --git a/expected/clean_aqo_data.out b/expected/clean_aqo_data.out
@@ -12,8 +12,8 @@ SELECT * FROM a;
 
 SELECT 'a'::regclass::oid AS a_oid \gset
 SELECT true FROM aqo_cleanup();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
@@ -55,8 +55,8 @@ SELECT count(*) FROM aqo_query_stat WHERE
 
 DROP TABLE a;
 SELECT true FROM aqo_cleanup();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
@@ -176,8 +176,8 @@ SELECT count(*) FROM aqo_query_stat WHERE
 
 DROP TABLE a;
 SELECT true FROM aqo_cleanup();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
@@ -254,8 +254,8 @@ SELECT count(*) FROM aqo_query_stat WHERE
 
 DROP TABLE b;
 SELECT true FROM aqo_cleanup();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
diff --git a/expected/feature_subspace.out b/expected/feature_subspace.out
@@ -76,8 +76,8 @@ WHERE 'a'::regclass = ANY (d1.oids) AND 'b'::regclass = ANY (d1.oids) order by t
 
 DROP TABLE a,b CASCADE;
 SELECT true FROM aqo_reset();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
diff --git a/expected/gucs.out b/expected/gucs.out
@@ -6,8 +6,8 @@ CREATE TABLE t(x int);
 INSERT INTO t (x) (SELECT * FROM generate_series(1, 100) AS gs);
 ANALYZE t;
 SELECT true FROM aqo_reset(); -- Remember! DROP EXTENSION doesn't remove any AQO data gathered.
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
@@ -90,10 +90,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 | record           | OUT nfs integer, OUT nfss integer | func
+                                  List of functions
+ Schema |    Name     |         Result data type         | Argument data types | Type 
+--------+-------------+----------------------------------+---------------------+------
+ public | aqo_cleanup | TABLE(nfs integer, nfss integer) |                     | func
 (1 row)
 
 \df aqo_reset
@@ -111,8 +111,8 @@ SELECT count(*) FROM aqo_query_stat;
 (1 row)
 
 SELECT true FROM aqo_reset(); -- Remove one record from all tables
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
diff --git a/expected/look_a_like.out b/expected/look_a_like.out
@@ -232,8 +232,8 @@ WHERE str NOT LIKE 'Query Identifier%' and str NOT LIKE '%Memory%';
 
 DROP TABLE a,b CASCADE;
 SELECT true FROM aqo_reset();
- bool 
-------
+ ?column? 
+----------
  t
 (1 row)
 
diff --git a/expected/unsupported.out b/expected/unsupported.out
@@ -44,7 +44,7 @@ EXPLAIN (ANALYZE, COSTS OFF, SUMMARY OFF, TIMING OFF)
    AQO not used
    Group Key: x
    ->  Seq Scan on t (actual rows=801 loops=1)
-         AQO not used
+         AQO: rows=801, error=0%
          Filter: (x > 3)
          Rows Removed by Filter: 199
  Using aqo: true
@@ -605,13 +605,13 @@ DROP TABLE t,t1 CASCADE; -- delete all tables used in the test
 SELECT count(*) FROM aqo_data; -- Just to detect some changes in the logic. May some false positives really bother us here?
  count 
 -------
-    42
+    44
 (1 row)
 
 SELECT * FROM aqo_cleanup();
  nfs | nfss 
 -----+------
-  12 |   42
+  13 |   44
 (1 row)
 
 SELECT count(*) FROM aqo_data; -- No one row should be returned

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ WHERE 'a'::regclass = ANY (d1.oids) AND 'b'::regclass = ANY (d1.oids) order by t`
`76`	`76`
`77`	`77`	`DROP TABLE a,b CASCADE;`
`78`	`78`	`SELECT true FROM aqo_reset();`
`79`		`- bool`
`80`		`-------`
	`79`	`+ ?column?`
	`80`	`+----------`
`81`	`81`	`t`
`82`	`82`	`(1 row)`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,8 @@ WHERE str NOT LIKE 'Query Identifier%' and str NOT LIKE '%Memory%';`
`232`	`232`
`233`	`233`	`DROP TABLE a,b CASCADE;`
`234`	`234`	`SELECT true FROM aqo_reset();`
`235`		`- bool`
`236`		`-------`
	`235`	`+ ?column?`
	`236`	`+----------`
`237`	`237`	`t`
`238`	`238`	`(1 row)`
`239`	`239`