Fix flaky ordered append regression tests

Disabling nested loops to make output tests deterministic. https://github.com/timescale/timescaledb/actions/runs/13556017463/job/37890546418#step:12:42 https://github.com/timescale/timescaledb/actions/runs/13556017463/job/37890546624#step:12:42
timescale · Mar 3, 2025 · 702cbc3 · 702cbc3
1 parent 326688a
commit 702cbc3
Show file tree

Hide file tree

Showing 11 changed files with 68 additions and 54 deletions.
diff --git a/tsl/test/shared/expected/ordered_append-14.out b/tsl/test/shared/expected/ordered_append-14.out
@@ -13,6 +13,7 @@ SELECT format('\! diff -u --label "Uncompressed results" --label "Compressed res
 \set PREFIX_VERBOSE 'EXPLAIN (analyze, costs off, timing off, summary off, verbose)'
 set work_mem to '64MB';
 set max_parallel_workers_per_gather to 0;
+set enable_nestloop to off;
 \set TEST_TABLE 'metrics'
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Timescale License.

diff --git a/tsl/test/shared/expected/ordered_append-15.out b/tsl/test/shared/expected/ordered_append-15.out
@@ -13,6 +13,7 @@ SELECT format('\! diff -u --label "Uncompressed results" --label "Compressed res
 \set PREFIX_VERBOSE 'EXPLAIN (analyze, costs off, timing off, summary off, verbose)'
 set work_mem to '64MB';
 set max_parallel_workers_per_gather to 0;
+set enable_nestloop to off;
 \set TEST_TABLE 'metrics'
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Timescale License.

diff --git a/tsl/test/shared/expected/ordered_append-16.out b/tsl/test/shared/expected/ordered_append-16.out
@@ -13,6 +13,7 @@ SELECT format('\! diff -u --label "Uncompressed results" --label "Compressed res
 \set PREFIX_VERBOSE 'EXPLAIN (analyze, costs off, timing off, summary off, verbose)'
 set work_mem to '64MB';
 set max_parallel_workers_per_gather to 0;
+set enable_nestloop to off;
 \set TEST_TABLE 'metrics'
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Timescale License.

diff --git a/tsl/test/shared/expected/ordered_append-17.out b/tsl/test/shared/expected/ordered_append-17.out
@@ -13,6 +13,7 @@ SELECT format('\! diff -u --label "Uncompressed results" --label "Compressed res
 \set PREFIX_VERBOSE 'EXPLAIN (analyze, costs off, timing off, summary off, verbose)'
 set work_mem to '64MB';
 set max_parallel_workers_per_gather to 0;
+set enable_nestloop to off;
 \set TEST_TABLE 'metrics'
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Timescale License.

diff --git a/tsl/test/shared/expected/ordered_append_join-14.out b/tsl/test/shared/expected/ordered_append_join-14.out
@@ -18,6 +18,7 @@ SELECT format('\! diff -u --label "Uncompressed results" --label "Compressed res
 \set PREFIX_VERBOSE 'EXPLAIN (analyze, costs off, timing off, summary off, verbose)'
 set work_mem to '64MB';
 set max_parallel_workers_per_gather to 0;
+set enable_nestloop to off;
 \set TEST_TABLE 'metrics'
 \ir :TEST_QUERY_NAME
 -- This file and its contents are licensed under the Timescale License.
@@ -30,6 +31,7 @@ set max_parallel_workers_per_gather to 0;
 -- SequentialScans. Disable the optimization for the following tests to ensure we have
 -- stable query plans in all CI environments.
 SET timescaledb.enable_decompression_sorted_merge = 0;
+SET enable_nestloop TO on;
 -- test LATERAL with ordered append in the outer query
 :PREFIX
 SELECT time,
@@ -79,6 +81,7 @@ QUERY PLAN
                            ->  Index Scan using _hyper_X_X_chunk_metrics_time_idx on _hyper_X_X_chunk (never executed)
 (10 rows)
 
+SET enable_nestloop TO off;
 -- test plan with best index is chosen
 -- this should use device_id, time index
 :PREFIX
@@ -116,6 +119,7 @@ QUERY PLAN
          ->  Index Scan using _hyper_X_X_chunk_metrics_time_idx on _hyper_X_X_chunk (never executed)
 (6 rows)
 
+SET enable_nestloop TO on;
 -- test LATERAL with correlated query
 -- only last chunk should be executed
 :PREFIX
@@ -261,7 +265,6 @@ QUERY PLAN
                      Index Cond: ((device_id = 2) AND ("time" < 'Tue Feb 01 00:00:00 2000 PST'::timestamp with time zone))
 (19 rows)
 
-RESET enable_nestloop;
 -- test JOIN
 -- last chunk of o2 should not be executed
 :PREFIX
@@ -296,7 +299,6 @@ QUERY PLAN
 -- test join against max query
 -- not ChunkAppend so no chunk exclusion
 SET enable_hashjoin = FALSE;
-SET enable_nestloop = FALSE;
 SET enable_hashagg = FALSE;
 :PREFIX
 SELECT o1.time,
@@ -335,7 +337,6 @@ QUERY PLAN
 (24 rows)
 
 RESET enable_hashjoin;
-RESET enable_nestloop;
 RESET enable_hashagg;
 SET enable_seqscan TO false;
 -- test JOIN on time column
@@ -740,6 +741,7 @@ RESET enable_seqscan;
 -- SequentialScans. Disable the optimization for the following tests to ensure we have
 -- stable query plans in all CI environments.
 SET timescaledb.enable_decompression_sorted_merge = 0;
+SET enable_nestloop TO on;
 -- test LATERAL with ordered append in the outer query
 :PREFIX
 SELECT time,
@@ -813,6 +815,7 @@ QUERY PLAN
                                  ->  Index Scan Backward using _hyper_X_X_chunk_metrics_space_time_idx on _hyper_X_X_chunk (never executed)
 (22 rows)
 
+SET enable_nestloop TO off;
 -- test plan with best index is chosen
 -- this should use device_id, time index
 :PREFIX
@@ -862,6 +865,7 @@ QUERY PLAN
                ->  Index Scan Backward using _hyper_X_X_chunk_metrics_space_time_idx on _hyper_X_X_chunk (never executed)
 (18 rows)
 
+SET enable_nestloop TO on;
 -- test LATERAL with correlated query
 -- only last chunk should be executed
 :PREFIX
@@ -1081,7 +1085,6 @@ QUERY PLAN
                      Index Cond: ((device_id = 2) AND ("time" < 'Tue Feb 01 00:00:00 2000 PST'::timestamp with time zone))
 (22 rows)
 
-RESET enable_nestloop;
 -- test JOIN
 -- last chunk of o2 should not be executed
 :PREFIX
@@ -1140,7 +1143,6 @@ QUERY PLAN
 -- test join against max query
 -- not ChunkAppend so no chunk exclusion
 SET enable_hashjoin = FALSE;
-SET enable_nestloop = FALSE;
 SET enable_hashagg = FALSE;
 :PREFIX
 SELECT o1.time,
@@ -1197,7 +1199,6 @@ QUERY PLAN
 (42 rows)
 
 RESET enable_hashjoin;
-RESET enable_nestloop;
 RESET enable_hashagg;
 SET enable_seqscan TO false;
 -- test JOIN on time column
@@ -1626,6 +1627,7 @@ RESET enable_seqscan;
 -- SequentialScans. Disable the optimization for the following tests to ensure we have
 -- stable query plans in all CI environments.
 SET timescaledb.enable_decompression_sorted_merge = 0;
+SET enable_nestloop TO on;
 -- test LATERAL with ordered append in the outer query
 :PREFIX
 SELECT time,
@@ -1695,6 +1697,7 @@ QUERY PLAN
                                        ->  Seq Scan on compress_hyper_X_X_chunk (never executed)
 (20 rows)
 
+SET enable_nestloop TO off;
 -- test plan with best index is chosen
 -- this should use device_id, time index
 :PREFIX
@@ -1745,6 +1748,7 @@ QUERY PLAN
                      ->  Seq Scan on compress_hyper_X_X_chunk (never executed)
 (16 rows)
 
+SET enable_nestloop TO on;
 -- test LATERAL with correlated query
 -- only last chunk should be executed
 :PREFIX
@@ -1950,7 +1954,6 @@ QUERY PLAN
                            Index Cond: ((device_id = 2) AND (_ts_meta_min_1 < 'Tue Feb 01 00:00:00 2000 PST'::timestamp with time zone))
 (31 rows)
 
-RESET enable_nestloop;
 -- test JOIN
 -- last chunk of o2 should not be executed
 :PREFIX
@@ -2004,7 +2007,6 @@ QUERY PLAN
 -- test join against max query
 -- not ChunkAppend so no chunk exclusion
 SET enable_hashjoin = FALSE;
-SET enable_nestloop = FALSE;
 SET enable_hashagg = FALSE;
 :PREFIX
 SELECT o1.time,
@@ -2056,7 +2058,6 @@ QUERY PLAN
 (37 rows)
 
 RESET enable_hashjoin;
-RESET enable_nestloop;
 RESET enable_hashagg;
 SET enable_seqscan TO false;
 -- test JOIN on time column
@@ -2531,6 +2532,7 @@ RESET enable_seqscan;
 -- SequentialScans. Disable the optimization for the following tests to ensure we have
 -- stable query plans in all CI environments.
 SET timescaledb.enable_decompression_sorted_merge = 0;
+SET enable_nestloop TO on;
 -- test LATERAL with ordered append in the outer query
 :PREFIX
 SELECT time,
@@ -2664,6 +2666,7 @@ QUERY PLAN
                                              ->  Seq Scan on compress_hyper_X_X_chunk (never executed)
 (52 rows)
 
+SET enable_nestloop TO off;
 -- test plan with best index is chosen
 -- this should use device_id, time index
 :PREFIX
@@ -2746,6 +2749,7 @@ QUERY PLAN
                            ->  Seq Scan on compress_hyper_X_X_chunk (never executed)
 (48 rows)
 
+SET enable_nestloop TO on;
 -- test LATERAL with correlated query
 -- only last chunk should be executed
 :PREFIX
@@ -3214,7 +3218,6 @@ QUERY PLAN
                            Index Cond: ((device_id = 2) AND (_ts_meta_min_1 < 'Tue Feb 01 00:00:00 2000 PST'::timestamp with time zone))
 (31 rows)
 
-RESET enable_nestloop;
 -- test JOIN
 -- last chunk of o2 should not be executed
 :PREFIX
@@ -3330,7 +3333,6 @@ QUERY PLAN
 -- test join against max query
 -- not ChunkAppend so no chunk exclusion
 SET enable_hashjoin = FALSE;
-SET enable_nestloop = FALSE;
 SET enable_hashagg = FALSE;
 :PREFIX
 SELECT o1.time,
@@ -3420,7 +3422,6 @@ QUERY PLAN
 (75 rows)
 
 RESET enable_hashjoin;
-RESET enable_nestloop;
 RESET enable_hashagg;
 SET enable_seqscan TO false;
 -- test JOIN on time column