Modify query in test

Author: mos65o2

src/test/regress/expected/limit.out

@@ -374,10 +374,11 @@ select sum(tenthous) as s1, sum(tenthous) + random()*0 as s2
 -- end_ignore
 create table limit_tbl(i int) distributed by (i);
 insert into limit_tbl select * from generate_series(1, 3) i;
+create function f(i int) returns int language plpgsql as $$ begin return i; end; $$;
 explain (verbose, costs off)
-select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
-                                                   QUERY PLAN                                                   
-----------------------------------------------------------------------------------------------------------------
+select (select f(a) from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
+                                     QUERY PLAN                                      
+-------------------------------------------------------------------------------------
  Gather Motion 3:1  (slice1; segments: 3)
    Output: ((SubPlan 1))
    Merge Key: ((SubPlan 1))
@@ -388,24 +389,25 @@ select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_
                Output: (SubPlan 1)
                SubPlan 1
                  ->  Limit
-                       Output: (((a.a)::double precision + (random() * '0'::double precision)))
+                       Output: (f(a.a))
                        ->  Materialize
-                             Output: (((a.a)::double precision + (random() * '0'::double precision)))
+                             Output: (f(a.a))
                              ->  Broadcast Motion 1:3  (slice2; segments: 1)
-                                   Output: (((a.a)::double precision + (random() * '0'::double precision)))
+                                   Output: (f(a.a))
                                    ->  Function Scan on pg_catalog.generate_series a
-                                         Output: ((a.a)::double precision + (random() * '0'::double precision))
+                                         Output: f(a.a)
                                          Function Call: generate_series(1, 4)
  Optimizer: Postgres-based planner
  Settings: optimizer = 'off'
 (20 rows)
 
-select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
+select (select f(a) from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
  r 
 ---
  2
  3
  4
 (3 rows)
 
+drop function f(int);
 drop table limit_tbl;

src/test/regress/expected/limit_optimizer.out

@@ -398,10 +398,11 @@ select sum(tenthous) as s1, sum(tenthous) + random()*0 as s2
 -- end_ignore
 create table limit_tbl(i int) distributed by (i);
 insert into limit_tbl select * from generate_series(1, 3) i;
+create function f(i int) returns int language plpgsql as $$ begin return i; end; $$;
 explain (verbose, costs off)
-select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
-                                                     QUERY PLAN                                                     
---------------------------------------------------------------------------------------------------------------------
+select (select f(a) from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
+                              QUERY PLAN                               
+-----------------------------------------------------------------------
  Sort
    Output: ((SubPlan 1))
    Sort Key: ((SubPlan 1))
@@ -413,7 +414,7 @@ select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_
                      Output: limit_tbl.i
          SubPlan 1
            ->  Result
-                 Output: ((generate_series.generate_series)::double precision + (random() * '0'::double precision))
+                 Output: f(generate_series.generate_series)
                  ->  Limit
                        Output: generate_series.generate_series
                        ->  Function Scan on pg_catalog.generate_series
@@ -422,12 +423,13 @@ select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_
  Optimizer: GPORCA
 (18 rows)
 
-select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
+select (select f(a) from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
  r 
 ---
  2
  3
  4
 (3 rows)
 
+drop function f(int);
 drop table limit_tbl;

src/test/regress/sql/limit.sql

@@ -151,12 +151,15 @@ select sum(tenthous) as s1, sum(tenthous) + random()*0 as s2
 -- Check the operation of the parameterized Limit in a subquery with a volatile function
 -- start_ignore
 drop table if exists limit_tbl;
+drop function if exists f(int);
 -- end_ignore
 create table limit_tbl(i int) distributed by (i);
 insert into limit_tbl select * from generate_series(1, 3) i;
+create function f(i int) returns int language plpgsql as $$ begin return i; end; $$;
 
 explain (verbose, costs off)
-select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
-select (select a + random()*0 from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
+select (select f(a) from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
+select (select f(a) from generate_series(1, 4) a limit 1 offset limit_tbl.i) as r from limit_tbl order by r;
 
+drop function f(int);
 drop table limit_tbl;