aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-11-24 00:29:20 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2017-11-24 00:29:20 -0500
commit292661e15248ed4df8b27d5a7e92ddb69dd52c1d (patch)
treea0d18397518356b8b83e18b81d4aa7bfd132fc74 /src
parentf16a0958d0ebebf9b4c3fc2272c3e1aa4ae3a1d2 (diff)
downloadpostgresql-292661e15248ed4df8b27d5a7e92ddb69dd52c1d.tar.gz
postgresql-292661e15248ed4df8b27d5a7e92ddb69dd52c1d.zip
Fix unstable regression test added by commits 59b71c6fe 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.
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/aggregates.out12
-rw-r--r--src/test/regress/sql/aggregates.sql6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index 56d7b20a0fa..11674a077bc 100644
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -2003,7 +2003,7 @@ CREATE AGGREGATE balk(
STYPE = int8,
"PARALLEL" = SAFE,
INITCOND = '0');
-SELECT balk(1) FROM tenk1;
+SELECT balk(hundred) FROM tenk1;
balk
------
@@ -2037,17 +2037,17 @@ CREATE AGGREGATE balk(
ALTER TABLE tenk1 set (parallel_workers = 4);
SET LOCAL parallel_setup_cost=0;
SET LOCAL max_parallel_workers_per_gather=4;
-EXPLAIN (COSTS OFF) SELECT balk(1) FROM tenk1;
- QUERY PLAN
---------------------------------------------------------------------------------
+EXPLAIN (COSTS OFF) SELECT balk(hundred) FROM tenk1;
+ QUERY PLAN
+-------------------------------------------------------------------------
Finalize Aggregate
-> Gather
Workers Planned: 4
-> Partial Aggregate
- -> Parallel Index Only Scan using tenk1_thous_tenthous on tenk1
+ -> Parallel Index Only Scan using tenk1_hundred on tenk1
(5 rows)
-SELECT balk(1) FROM tenk1;
+SELECT balk(hundred) FROM tenk1;
balk
------
diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index b216808b3e2..4ead553479c 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -862,7 +862,7 @@ CREATE AGGREGATE balk(
"PARALLEL" = SAFE,
INITCOND = '0');
-SELECT balk(1) FROM tenk1;
+SELECT balk(hundred) FROM tenk1;
ROLLBACK;
@@ -896,7 +896,7 @@ ALTER TABLE tenk1 set (parallel_workers = 4);
SET LOCAL parallel_setup_cost=0;
SET LOCAL max_parallel_workers_per_gather=4;
-EXPLAIN (COSTS OFF) SELECT balk(1) FROM tenk1;
-SELECT balk(1) FROM tenk1;
+EXPLAIN (COSTS OFF) SELECT balk(hundred) FROM tenk1;
+SELECT balk(hundred) FROM tenk1;
ROLLBACK;