Set join limit to non-zero value.

We should accept the law of life: people establish their attitude to product with first glance, first use, without learning any optimization techniques. So, most of them will use it with default value of GUCS. According to this fact, set default value of joins limit to higher value and set it to zero manually at each test case.

Author: danolivo

aqo.c

@@ -203,7 +203,7 @@ _PG_init(void)
 "Sets the threshold of number of JOINs in query beyond which AQO is used.",
 NULL,
 &aqo_join_threshold,
-0,
+3,
 0, INT_MAX / 1000,
 PGC_USERSET,
 0,

expected/aqo_CVE-2020-14350.out

@@ -27,6 +27,7 @@ END
 $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 RESET ROLE;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 -- Test result (must be 'off')
 SET ROLE regress_hacker;
 SHOW is_superuser;

expected/aqo_controlled.out

@@ -26,6 +26,7 @@ AS (
 CREATE INDEX aqo_test2_idx_a ON aqo_test2 (a);
 ANALYZE aqo_test2;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'controlled';
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0

expected/aqo_disabled.out

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

expected/aqo_fdw.out

@@ -8,6 +8,7 @@ CREATE EXTENSION postgres_fdw;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'true'; -- show AQO info for each node and entire query.
 SET aqo.show_hash = 'false'; -- a hash value is system-depended. Ignore it.
+SET aqo.join_threshold = 0;
 DO $d$
 BEGIN
 EXECUTE $$CREATE SERVER loopback FOREIGN DATA WRAPPER postgres_fdw

expected/aqo_forced.out

@@ -17,6 +17,7 @@ AS (
 CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'controlled';
 EXPLAIN (COSTS FALSE)
 SELECT * FROM aqo_test0

expected/aqo_intelligent.out

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

expected/aqo_learn.out

@@ -37,6 +37,7 @@ AS (
 CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 EXPLAIN SELECT * FROM aqo_test0
 WHERE a < 3 AND b < 3 AND c < 3 AND d < 3;

expected/clean_aqo_data.out

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 DROP TABLE IF EXISTS a;
 NOTICE: table "a" does not exist, skipping

expected/forced_stat_collection.out

@@ -1,4 +1,5 @@
 \set citizens	1000
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'disabled';
 SET aqo.force_collect_stat = 'on';
 CREATE TABLE person (

expected/gucs.out

@@ -1,42 +1,5 @@
 CREATE EXTENSION aqo;
--- Check interface variables and their default values. Detect, if default value
--- of a GUC is changed.
-SHOW aqo.join_threshold;
-aqo.join_threshold
---------------------
-0
-(1 row)
-
-SHOW aqo.learn_statement_timeout;
-aqo.learn_statement_timeout
------------------------------
-off
-(1 row)
-
-SHOW aqo.show_hash;
-aqo.show_hash
----------------
-off
-(1 row)
-
-SHOW aqo.show_details;
-aqo.show_details
-------------------
-off
-(1 row)
-
-SHOW aqo.force_collect_stat;
-aqo.force_collect_stat
-------------------------
-off
-(1 row)
-
-SHOW aqo.mode;
-aqo.mode
-------------
-controlled
-(1 row)
-
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = true;
 CREATE TABLE t(x int);

expected/plancache.out

@@ -1,5 +1,6 @@
 -- Tests on interaction of AQO with cached plans.
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 SET aqo.show_details = 'on';
 SET aqo.show_hash = 'off';

expected/schema.out

@@ -12,6 +12,7 @@ ERROR: no schema has been selected to create in
 CREATE SCHEMA IF NOT EXISTS test1;
 SET search_path TO test1, public;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 CREATE TABLE test (id SERIAL, data TEXT);
 INSERT INTO test (data) VALUES ('string');

expected/statement_timeout.out

@@ -21,6 +21,7 @@ CREATE TABLE t AS SELECT * FROM generate_series(1,100) AS x;
 ANALYZE t;
 DELETE FROM t WHERE x > 5; -- Force optimizer to make overestimated prediction.
 CREATE EXTENSION IF NOT EXISTS aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'off';
 SET aqo.learn_statement_timeout = 'on';

expected/temp_tables.out

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 CREATE TEMP TABLE tt();
 CREATE TABLE pt();

expected/top_queries.out

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'disabled';
 SET aqo.force_collect_stat = 'on';
 --

expected/unsupported.out

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'on';
 DROP TABLE IF EXISTS t;

sql/aqo_CVE-2020-14350.sql

@@ -27,6 +27,7 @@ $$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
 
 RESET ROLE;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 
 -- Test result (must be 'off')
 SET ROLE regress_hacker;

sql/aqo_controlled.sql

@@ -29,6 +29,7 @@ CREATE INDEX aqo_test2_idx_a ON aqo_test2 (a);
 ANALYZE aqo_test2;
 
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 
 SET aqo.mode = 'controlled';
 

sql/aqo_disabled.sql

@@ -18,6 +18,7 @@ AS (
 CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 
 SET aqo.mode = 'controlled';
 

sql/aqo_fdw.sql

@@ -9,6 +9,7 @@ CREATE EXTENSION postgres_fdw;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'true'; -- show AQO info for each node and entire query.
 SET aqo.show_hash = 'false'; -- a hash value is system-depended. Ignore it.
+SET aqo.join_threshold = 0;
 
 DO $d$
 BEGIN

sql/aqo_forced.sql

@@ -19,6 +19,7 @@ CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 
 SET aqo.mode = 'controlled';
 

sql/aqo_intelligent.sql

@@ -19,6 +19,7 @@ CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 
 SET aqo.mode = 'intelligent';
 

sql/aqo_learn.sql

@@ -40,6 +40,7 @@ CREATE INDEX aqo_test1_idx_a ON aqo_test1 (a);
 ANALYZE aqo_test1;
 
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 
 SET aqo.mode = 'intelligent';
 

sql/clean_aqo_data.sql

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 
 DROP TABLE IF EXISTS a;

sql/forced_stat_collection.sql

@@ -1,5 +1,6 @@
 \set citizens	1000
 
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'disabled';
 SET aqo.force_collect_stat = 'on';
 

sql/gucs.sql

@@ -1,13 +1,5 @@
 CREATE EXTENSION aqo;
-
--- Check interface variables and their default values. Detect, if default value
--- of a GUC is changed.
-SHOW aqo.join_threshold;
-SHOW aqo.learn_statement_timeout;
-SHOW aqo.show_hash;
-SHOW aqo.show_details;
-SHOW aqo.force_collect_stat;
-SHOW aqo.mode;
+SET aqo.join_threshold = 0;
 
 SET aqo.mode = 'learn';
 SET aqo.show_details = true;

sql/plancache.sql

@@ -1,6 +1,7 @@
 -- Tests on interaction of AQO with cached plans.
 
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 SET aqo.show_details = 'on';
 SET aqo.show_hash = 'off';

sql/schema.sql

@@ -11,6 +11,7 @@ CREATE EXTENSION aqo; -- fail
 CREATE SCHEMA IF NOT EXISTS test1;
 SET search_path TO test1, public;
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'intelligent';
 
 CREATE TABLE test (id SERIAL, data TEXT);

sql/statement_timeout.sql

@@ -23,6 +23,7 @@ ANALYZE t;
 DELETE FROM t WHERE x > 5; -- Force optimizer to make overestimated prediction.
 
 CREATE EXTENSION IF NOT EXISTS aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'off';
 SET aqo.learn_statement_timeout = 'on';

sql/temp_tables.sql

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 
 CREATE TEMP TABLE tt();

sql/top_queries.sql

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'disabled';
 SET aqo.force_collect_stat = 'on';
 

sql/unsupported.sql

@@ -1,4 +1,5 @@
 CREATE EXTENSION aqo;
+SET aqo.join_threshold = 0;
 SET aqo.mode = 'learn';
 SET aqo.show_details = 'on';
 

t/001_pgbench.pl

@@ -12,6 +12,7 @@
 shared_preload_libraries = 'aqo'
 aqo.mode = 'intelligent'
 log_statement = 'ddl'
+aqo.join_threshold = 0
 });
 
 # Test constants. Default values.

t/002_pg_stat_statements_aqo.pl

@@ -15,6 +15,7 @@
 aqo.profile_enable = 'true'
 aqo.force_collect_stat = 'false'
 log_statement = 'ddl' # reduce size of logs.
+aqo.join_threshold = 0
 });
 # Test constants.
 my $TRANSACTIONS = 100;