Improvement of time-dependent test statement_timeout.

Remember, each query can be executed longer than the timeout on an ancient
machines of buildfarm. So, RESET this GUC each time when it isn't really
needed for a test query.

Author: danolivo

expected/statement_timeout.out

@@ -35,6 +35,7 @@ SET statement_timeout = 80; -- [0.1s]
 SELECT *, pg_sleep(0.1) FROM t;
 NOTICE:  [AQO] Time limit for execution of the statement was expired. AQO tried to learn on partial data.
 ERROR:  canceling statement due to statement timeout
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;'); -- haven't any partial data
  check_estimated_rows 
 ----------------------
@@ -46,6 +47,7 @@ SET statement_timeout = 350;
 SELECT *, pg_sleep(0.1) FROM t;
 NOTICE:  [AQO] Time limit for execution of the statement was expired. AQO tried to learn on partial data.
 ERROR:  canceling statement due to statement timeout
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
  check_estimated_rows 
 ----------------------
@@ -64,6 +66,7 @@ SELECT *, pg_sleep(0.1) FROM t;
  5 | 
 (5 rows)
 
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
  check_estimated_rows 
 ----------------------
@@ -84,6 +87,7 @@ SET statement_timeout = 80;
 SELECT *, pg_sleep(0.1) FROM t; -- Not learned
 NOTICE:  [AQO] Time limit for execution of the statement was expired. AQO tried to learn on partial data.
 ERROR:  canceling statement due to statement timeout
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
  check_estimated_rows 
 ----------------------
@@ -94,6 +98,7 @@ SET statement_timeout = 350;
 SELECT *, pg_sleep(0.1) FROM t; -- Learn!
 NOTICE:  [AQO] Time limit for execution of the statement was expired. AQO tried to learn on partial data.
 ERROR:  canceling statement due to statement timeout
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
  check_estimated_rows 
 ----------------------
@@ -111,6 +116,7 @@ SELECT *, pg_sleep(0.1) FROM t; -- Get reliable data
  5 | 
 (5 rows)
 
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
  check_estimated_rows 
 ----------------------
@@ -134,18 +140,19 @@ SELECT count(*) FROM aqo_data; -- Must be zero
 SELECT x, pg_sleep(0.1) FROM t WHERE x > 0;
 NOTICE:  [AQO] Time limit for execution of the statement was expired. AQO tried to learn on partial data.
 ERROR:  canceling statement due to statement timeout
+RESET statement_timeout;
 SELECT count(*) FROM aqo_data; -- Must be one
  count 
 -------
      1
 (1 row)
 
+DROP TABLE t;
+DROP FUNCTION check_estimated_rows;
 SELECT true AS success FROM aqo_reset();
  success 
 ---------
  t
 (1 row)
 
-DROP TABLE t;
 DROP EXTENSION aqo;
-DROP FUNCTION check_estimated_rows;

sql/statement_timeout.sql

@@ -32,16 +32,22 @@ SET aqo.learn_statement_timeout = 'on';
 
 SET statement_timeout = 80; -- [0.1s]
 SELECT *, pg_sleep(0.1) FROM t;
+
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;'); -- haven't any partial data
 
 -- Don't learn because running node has smaller cardinality than an optimizer prediction
 SET statement_timeout = 350;
 SELECT *, pg_sleep(0.1) FROM t;
+
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
 
 -- We have a real learning data.
 SET statement_timeout = 800;
 SELECT *, pg_sleep(0.1) FROM t;
+
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
 
 -- Force to make an underestimated prediction
@@ -52,24 +58,33 @@ SELECT true AS success FROM aqo_reset();
 
 SET statement_timeout = 80;
 SELECT *, pg_sleep(0.1) FROM t; -- Not learned
+
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
 
 SET statement_timeout = 350;
 SELECT *, pg_sleep(0.1) FROM t; -- Learn!
+
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
 
 SET statement_timeout = 550;
 SELECT *, pg_sleep(0.1) FROM t; -- Get reliable data
+
+RESET statement_timeout;
 SELECT check_estimated_rows('SELECT *, pg_sleep(0.1) FROM t;');
 
 -- Interrupted query should immediately appear in aqo_data
 SELECT true AS success FROM aqo_reset();
 SET statement_timeout = 500;
 SELECT count(*) FROM aqo_data; -- Must be zero
 SELECT x, pg_sleep(0.1) FROM t WHERE x > 0;
+
+RESET statement_timeout;
 SELECT count(*) FROM aqo_data; -- Must be one
 
-SELECT true AS success FROM aqo_reset();
 DROP TABLE t;
-DROP EXTENSION aqo;
 DROP FUNCTION check_estimated_rows;
+
+SELECT true AS success FROM aqo_reset();
+DROP EXTENSION aqo;