aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-11-03 13:42:04 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2010-11-03 13:42:04 -0400
commit78f0924f0081913095677b0b6bfe2877f6b5e5a5 (patch)
tree09dbf309cca9e34a818150a1bb748fd6b0b84c8f
parent55c3a7c0a5b335f03bf1bd26f1b7542d5305d256 (diff)
downloadpostgresql-78f0924f0081913095677b0b6bfe2877f6b5e5a5.tar.gz
postgresql-78f0924f0081913095677b0b6bfe2877f6b5e5a5.zip
Reduce recursion depth in recently-added regression test.
Some buildfarm members fail the test with the original depth of 10 levels, apparently because they are running at the minimum max_stack_depth setting of 100kB and using ~ 10k per recursion level. While it might be interesting to try to figure out why they're eating so much stack, it isn't likely that any fix for that would be back-patchable. So just change the test to recurse only 5 levels. The extra levels don't prove anything correctness-wise anyway.
-rw-r--r--src/test/regress/expected/plpgsql.out8
-rw-r--r--src/test/regress/sql/plpgsql.sql6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 314281fe6ed..163268c7dfb 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -3788,8 +3788,8 @@ DROP FUNCTION nonsimple_expr_test();
create function recurse(float8) returns float8 as
$$
begin
- if ($1 < 10) then
- return sql_recurse($1 + 1);
+ if ($1 > 0) then
+ return sql_recurse($1 - 1);
else
return $1;
end if;
@@ -3798,10 +3798,10 @@ $$ language plpgsql;
-- "limit" is to prevent this from being inlined
create function sql_recurse(float8) returns float8 as
$$ select recurse($1) limit 1; $$ language sql;
-select recurse(0);
+select recurse(5);
recurse
---------
- 10
+ 0
(1 row)
create function error1(text) returns text language sql as
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index 7a5ee7c0b5b..48bb538f52c 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -3055,8 +3055,8 @@ DROP FUNCTION nonsimple_expr_test();
create function recurse(float8) returns float8 as
$$
begin
- if ($1 < 10) then
- return sql_recurse($1 + 1);
+ if ($1 > 0) then
+ return sql_recurse($1 - 1);
else
return $1;
end if;
@@ -3067,7 +3067,7 @@ $$ language plpgsql;
create function sql_recurse(float8) returns float8 as
$$ select recurse($1) limit 1; $$ language sql;
-select recurse(0);
+select recurse(5);
create function error1(text) returns text language sql as
$$ SELECT relname::text FROM pg_class c WHERE c.oid = $1::regclass $$;