Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 292661e

Browse files
committed
Fix unstable regression test added by commits 59b71c6 et al.
The query didn't really have a preferred index, leading to platform- specific choices of which one to use. Adjust it to make sure tenk1_hundred is always chosen. Per buildfarm.
1 parent f16a095 commit 292661e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/test/regress/expected/aggregates.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,7 +2003,7 @@ CREATE AGGREGATE balk(
20032003
STYPE = int8,
20042004
"PARALLEL" = SAFE,
20052005
INITCOND = '0');
2006-
SELECT balk(1) FROM tenk1;
2006+
SELECT balk(hundred) FROM tenk1;
20072007
balk
20082008
------
20092009

@@ -2037,17 +2037,17 @@ CREATE AGGREGATE balk(
20372037
ALTER TABLE tenk1 set (parallel_workers = 4);
20382038
SET LOCAL parallel_setup_cost=0;
20392039
SET LOCAL max_parallel_workers_per_gather=4;
2040-
EXPLAIN (COSTS OFF) SELECT balk(1) FROM tenk1;
2041-
QUERY PLAN
2042-
--------------------------------------------------------------------------------
2040+
EXPLAIN (COSTS OFF) SELECT balk(hundred) FROM tenk1;
2041+
QUERY PLAN
2042+
-------------------------------------------------------------------------
20432043
Finalize Aggregate
20442044
-> Gather
20452045
Workers Planned: 4
20462046
-> Partial Aggregate
2047-
-> Parallel Index Only Scan using tenk1_thous_tenthous on tenk1
2047+
-> Parallel Index Only Scan using tenk1_hundred on tenk1
20482048
(5 rows)
20492049

2050-
SELECT balk(1) FROM tenk1;
2050+
SELECT balk(hundred) FROM tenk1;
20512051
balk
20522052
------
20532053

src/test/regress/sql/aggregates.sql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ CREATE AGGREGATE balk(
862862
"PARALLEL" = SAFE,
863863
INITCOND = '0');
864864

865-
SELECT balk(1) FROM tenk1;
865+
SELECT balk(hundred) FROM tenk1;
866866

867867
ROLLBACK;
868868

@@ -896,7 +896,7 @@ ALTER TABLE tenk1 set (parallel_workers = 4);
896896
SET LOCAL parallel_setup_cost=0;
897897
SET LOCAL max_parallel_workers_per_gather=4;
898898

899-
EXPLAIN (COSTS OFF) SELECT balk(1) FROM tenk1;
900-
SELECT balk(1) FROM tenk1;
899+
EXPLAIN (COSTS OFF) SELECT balk(hundred) FROM tenk1;
900+
SELECT balk(hundred) FROM tenk1;
901901

902902
ROLLBACK;

0 commit comments

Comments
 (0)