Merge branch 'stable13' into s13-ci-whooks

Author: danolivo

.github/workflows/c-cpp.yml

@@ -53,6 +53,7 @@ jobs:
     - name: "Prepare PG directory"
       run: |
         cd $PG_DIR
+
         cp -r ../aqo contrib/aqo
         patch -p1 --no-backup-if-mismatch < contrib/aqo/$CORE_PATCH_NAME
         echo "COPT=-Werror" >> $GITHUB_ENV

.github/workflows/installchecks.yml

@@ -33,6 +33,7 @@ jobs:
 
         branch_name="REL_${vers_number}_STABLE"
         echo "PG_BRANCH=$branch_name" >> $GITHUB_ENV
+
     - name: "Set master branch name, if needed"
       if: env.PG_MAJOR_VERSION == ''
       run: |
@@ -78,6 +79,7 @@ jobs:
     - name: "Compilation"
       run: |
         cd $PG_DIR
+
         echo "COPT: $COPT"
         echo "CONFIGURE_OPTS: $CONFIGURE_OPTS"
         ./configure $CONFIGURE_OPTS CFLAGS="-O2" > /dev/null
@@ -98,20 +100,23 @@ jobs:
     - name: installcheck_disabled
       run: |
         cd $PG_DIR
+
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'off'"
         psql -c "SELECT pg_reload_conf()"
         make installcheck-world
 
     - name: installcheck_disabled_forced_stat
       run: |
         cd $PG_DIR
+
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
         make installcheck-world
 
     - name: installcheck_frozen
       run: |
         cd $PG_DIR
+
         psql -c "ALTER SYSTEM SET aqo.mode = 'frozen'"
         psql -c "ALTER SYSTEM SET aqo.force_collect_stat = 'on'"
         psql -c "SELECT pg_reload_conf()"
@@ -154,10 +159,10 @@ jobs:
 
     # Save Artifacts
     - name: Archive artifacts
-      if: ${{ failure() }}
+      if: ${{ always() }}
       uses: actions/upload-artifact@v3
       with:
-        name: ${{ env.AQO_VERSION }}-${{ env.CORE_BRANCH_NAME }}-${{ env.BRANCH_NAME }}-artifacts
+        name: ${{ env.AQO_VERSION }}-${{ env.PG_BRANCH }}-${{ env.CORE_PATCH_NAME }}-artifacts
         path: |
           ${{ env.PG_DIR }}/src/test/regress/regression.diffs
           ${{ env.PG_DIR }}/logfile.log

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;

regress_schedule

@@ -15,6 +15,7 @@ test: plancache
 test: update_functions
 # Performance-dependent test. Can be ignored if executes in containers or on slow machines
 ignore: statement_timeout
+test: statement_timeout
 test: temp_tables
 test: top_queries
 test: relocatable

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;