git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix failing regression test on x86-32 machines

author David Rowley <drowley@postgresql.org>

2025年3月31日 21:52:25 +0000 (10:52 +1300)

committer David Rowley <drowley@postgresql.org>

2025年3月31日 21:52:25 +0000 (10:52 +1300)

95d6e9af0 added code to display the tuplestore storage type for
WindowAgg nodes and added a test to ensure the "Disk" storage method was
working correctly by setting work_mem to 64 and running a test which
caused the WindowAgg to go to disk. Seemingly, the number of rows
chosen there wasn't quite enough for that to happen in x86 32-bit.

Fix this by increasing the number of rows slightly.

I suspect the buildfarm didn't catch this as MEMORY_CONTEXT_CHECKING
builds will use a bit more memory for MemoryChunks to store the
requested_size and also because of the additional space to store the
chunk's sentinel byte.

Reported-by: Christoph Berg <myon@debian.org>
Discussion: https://postgr.es/m/Z-q3ZAM4OhE-4UiI@msg.df7cb.de

src/test/regress/expected/explain.out patch | blob | blame | history

src/test/regress/sql/explain.sql patch | blob | blame | history

diff --git a/src/test/regress/expected/explain.out b/src/test/regress/expected/explain.out

index 340747a8f75a11156c9d8c79548a4e73a8880a80..c53bf9c8aa3cc39f79c6170b168e0b3e3c7cfeab 100644 (file)

--- a/src/test/regress/expected/explain.out

+++ b/src/test/regress/expected/explain.out

@@ -787,7 +787,7 @@ select explain_filter('explain (analyze,buffers off,costs off) select sum(n) ove

-- Test tuplestore storage usage in Window aggregate (disk case)

set work_mem to 64;

-select explain_filter('explain (analyze,buffers off,costs off) select sum(n) over() from generate_series(1,2000) a(n)');

+select explain_filter('explain (analyze,buffers off,costs off) select sum(n) over() from generate_series(1,2500) a(n)');

explain_filter

----------------------------------------------------------------------------------

WindowAgg (actual time=N.N..N.N rows=N.N loops=N)

@@ -799,7 +799,7 @@ select explain_filter('explain (analyze,buffers off,costs off) select sum(n) ove

(6 rows)

-- Test tuplestore storage usage in Window aggregate (memory and disk case, final result is disk)

-select explain_filter('explain (analyze,buffers off,costs off) select sum(n) over(partition by m) from (SELECT n < 3 as m, n from generate_series(1,2000) a(n))');

+select explain_filter('explain (analyze,buffers off,costs off) select sum(n) over(partition by m) from (SELECT n < 3 as m, n from generate_series(1,2500) a(n))');

explain_filter

----------------------------------------------------------------------------------------

WindowAgg (actual time=N.N..N.N rows=N.N loops=N)

diff --git a/src/test/regress/sql/explain.sql b/src/test/regress/sql/explain.sql

index b266764089f80412bac7738c785500708ca27722..7842d25ded3fe4ce9863e4de2593630fffda7dc3 100644 (file)

--- a/src/test/regress/sql/explain.sql

+++ b/src/test/regress/sql/explain.sql

@@ -183,7 +183,7 @@ select explain_filter('explain (analyze,buffers off,serialize) create temp table

select explain_filter('explain (analyze,buffers off,costs off) select sum(n) over() from generate_series(1,10) a(n)');