summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-11-03 13:42:24 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2010-11-03 13:42:24 -0400
commit9f22a3f091e125af166c67ffaba87aa3f86a28db (patch)
tree1fca78e7ff7d6aca8eece8b05fddfbf2bc7fd429
parent2868b0cbe061724b7d46234cf053f7fdb3672600 (diff)
downloadpostgresql-9f22a3f091e125af166c67ffaba87aa3f86a28db.tar.gz
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 bfa47eb3ca..3fdf71cc21 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -2790,8 +2790,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;
@@ -2800,10 +2800,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 11227ec5b7..9a602c3575 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -2345,8 +2345,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;
@@ -2357,7 +2357,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 $$;