postgres.git / summary / log / commit / refs

commit    d611517fc44ebbf7e0d563de6d4cd98fd342a762
Author:   Andres Freund <andres@anarazel.de>
Date:     Thu Apr 06 21:21:39 2017 +0000

    Fix parallel bitmapscan tests on builds without USE_PREFETCH.
    
    This was broken in 5a5931533edd2.


 src/test/regress/expected/select_parallel.out | 7 ++++++-
 src/test/regress/sql/select_parallel.sql      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out
index d65c2b93a8c..0e9bc1a7078 100644
--- a/src/test/regress/expected/select_parallel.out
+++ b/src/test/regress/expected/select_parallel.out
@@ -175,7 +175,12 @@ set enable_indexscan to off;
 set enable_hashjoin to off;
 set enable_mergejoin to off;
 set enable_material to off;
-set effective_io_concurrency=50;
+-- test prefetching, if the platform allows it
+DO $$
+BEGIN
+ SET effective_io_concurrency = 50;
+EXCEPTION WHEN invalid_parameter_value THEN
+END $$;
 set work_mem='64kB';  --set small work mem to force lossy pages
 explain (costs off)
 	select count(*) from tenk1, tenk2 where tenk1.hundred > 1 and tenk2.thousand=0;
diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql
index b2a0bd5d94a..67bc82e8347 100644
--- a/src/test/regress/sql/select_parallel.sql
+++ b/src/test/regress/sql/select_parallel.sql
@@ -70,7 +70,12 @@ set enable_indexscan to off;
 set enable_hashjoin to off;
 set enable_mergejoin to off;
 set enable_material to off;
-set effective_io_concurrency=50;
+-- test prefetching, if the platform allows it
+DO $$
+BEGIN
+ SET effective_io_concurrency = 50;
+EXCEPTION WHEN invalid_parameter_value THEN
+END $$;
 set work_mem='64kB';  --set small work mem to force lossy pages
 explain (costs off)
 	select count(*) from tenk1, tenk2 where tenk1.hundred > 1 and tenk2.thousand=0;


[parent: 7e534adcdc70]