diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2019-12-16 20:14:25 -0500 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2019-12-16 20:14:35 -0500 |
commit | b925a00f4ef65db9359e1c60fbf0e56d05afb25a (patch) | |
tree | 4050ae506297df680de96e15566084c8fb1ae8e4 /src/test/regress/expected/subselect.out | |
parent | 9067b83955da5fde49a2605510900e6d9fa273af (diff) | |
download | postgresql-b925a00f4ef65db9359e1c60fbf0e56d05afb25a.tar.gz |
Fix "force_parallel_mode = regress" to work with ANALYZE + VERBOSE.
force_parallel_mode = regress is supposed to force use of a Gather
node without having any impact on EXPLAIN output. But it failed to
accomplish that if both ANALYZE and VERBOSE are given, because that
enables per-worker output data that you wouldn't see if the Gather
hadn't been inserted. Improve the logic so that we suppress the
per-worker data too.
This allows putting the new test case added by commit 5935917ce
back into the originally intended form (cf. 776a2c887, 22864f6e0).
We can also get rid of a kluge in subselect.sql, which previously
had to clean up after force_parallel_mode's failure to do what it
said on the tin.
Discussion: https://postgr.es/m/18445.1576177309@sss.pgh.pa.us
Diffstat (limited to 'src/test/regress/expected/subselect.out')
-rw-r--r-- | src/test/regress/expected/subselect.out | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out index ee9c5db0d5..547686166a 100644 --- a/src/test/regress/expected/subselect.out +++ b/src/test/regress/expected/subselect.out @@ -1166,8 +1166,6 @@ begin select * from (select pk,c2 from sq_limit order by c1,pk) as x limit 3 loop ln := regexp_replace(ln, 'Memory: \S*', 'Memory: xxx'); - -- this case might occur if force_parallel_mode is on: - ln := regexp_replace(ln, 'Worker 0: Sort Method', 'Sort Method'); return next ln; end loop; end; |