Reduce test variability for toast_tuple_target test

diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out
index 3a42ef77be3ee1e5303fcb1828427158971def53..8073eb4fad9b0eef573147415baf0955f1d3fe57 100644 (file)
--- a/src/test/regress/expected/strings.out
+++ b/src/test/regress/expected/strings.out
@@ -1167,50 +1167,28 @@ SELECT substr(f1, 99995, 10) from toasttest;
 (4 rows)
 
 TRUNCATE TABLE toasttest;
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-SELECT pg_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect >0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
  blocks 
 --------
-      1
-(1 row)
-
-select pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
- blocks 
---------
-      3
-(1 row)
-
-SELECT pg_total_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
- blocks 
---------
-      9
+ f
 (1 row)
 
 TRUNCATE TABLE toasttest;
 ALTER TABLE toasttest set (toast_tuple_target = 4080);
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-SELECT pg_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect 0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
  blocks 
 --------
-      2
-(1 row)
-
-select pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
- blocks 
---------
-      0
-(1 row)
-
-SELECT pg_total_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
- blocks 
---------
-      6
+ t
 (1 row)
 
 DROP TABLE toasttest;

diff --git a/src/test/regress/sql/strings.sql b/src/test/regress/sql/strings.sql
index 6396693f2796713cf4c29ae2f0684f2051990052..9ed242208f0df6f910333bdc62f60367bc655ea6 100644 (file)
--- a/src/test/regress/sql/strings.sql
+++ b/src/test/regress/sql/strings.sql
@@ -367,23 +367,21 @@ SELECT substr(f1, 99995) from toasttest;
 SELECT substr(f1, 99995, 10) from toasttest;
 
 TRUNCATE TABLE toasttest;
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-SELECT pg_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
-select pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
-SELECT pg_total_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect >0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
 
 TRUNCATE TABLE toasttest;
 ALTER TABLE toasttest set (toast_tuple_target = 4080);
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-INSERT INTO toasttest values (repeat('1234567890',400));
-SELECT pg_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
-select pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
-SELECT pg_total_relation_size('toasttest')/current_setting('block_size')::integer as blocks;
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect 0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
 
 DROP TABLE toasttest;