pg_regress: accept new diffs

* ltree patches moved some type outputs around
* a change to pg_regress output moved diffs down 6 rows.

Fixes: #151625
Release note: None

Author: mw5h

pkg/cmd/roachtest/testdata/pg_regress/aggregates.diffs

@@ -1348,7 +1348,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- Ensure that we never choose to provide presorted input to an Aggref with
  -- a volatile function in the ORDER BY / DISTINCT clause.  We want to ensure
  -- these sorts are performed individually rather than at the query level.
-@@ -1527,34 +1306,76 @@
+@@ -1527,34 +1306,78 @@
    sum(unique1 order by two, random(), random() + 1)
  from tenk1
  group by ten;
@@ -1418,6 +1418,8 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
 +array_agg(jsonb[]) -> jsonb[][]
 +array_agg(varbit) -> varbit[]
 +array_agg(varbit[]) -> varbit[][]
++array_agg(ltree) -> ltree[]
++array_agg(ltree[]) -> ltree[][]
 +array_agg(anyenum) -> anyenum[]
 +array_agg(anyenum[]) -> anyenum[][]
 +array_agg(tuple) -> tuple[]
@@ -1444,7 +1446,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  --
  -- Test combinations of DISTINCT and/or ORDER BY
  --
-@@ -1595,246 +1416,186 @@
+@@ -1595,246 +1418,186 @@
 
  select array_agg(distinct a order by a)
    from (values (1),(2),(1),(3),(null),(2)) v(a);
@@ -1788,7 +1790,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- string_agg tests
  select string_agg(a,',') from (values('aaaa'),('bbbb'),('cccc')) g(a);
     string_agg   
-@@ -1862,25 +1623,29 @@
+@@ -1862,25 +1625,29 @@
 
  -- check some implicit casting cases, as per bug #5564
  select string_agg(distinct f1, ',' order by f1) from varchar_tbl;  -- ok
@@ -1834,7 +1836,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- string_agg bytea tests
  create table bytea_test_table(v bytea);
  select string_agg(v, '') from bytea_test_table;
-@@ -1922,11 +1687,60 @@
+@@ -1922,11 +1689,60 @@
  select (case x % 4 when 1 then null else x end), x % 10
  from generate_series(1,5000) x;
  set parallel_setup_cost TO 0;
@@ -1895,7 +1897,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- create a view as we otherwise have to repeat this query a few times.
  create view v_pagg_test AS
  select
-@@ -1954,66 +1768,92 @@
+@@ -1954,66 +1770,92 @@
  	) a1
  ) a2
  group by y;
@@ -2033,7 +2035,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  drop table pagg_test;
  -- FILTER tests
  select min(unique1) filter (where unique1 > 100) from tenk1;
-@@ -2023,13 +1863,9 @@
+@@ -2023,13 +1865,9 @@
  (1 row)
 
  select sum(1/ten) filter (where ten > 0) from tenk1;
@@ -2049,7 +2051,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
   ten | sum 
  -----+-----
     0 |    
-@@ -2045,17 +1881,14 @@
+@@ -2045,17 +1883,14 @@
  (10 rows)
 
  select ten, sum(distinct four) filter (where four > 10) from onek a
@@ -2074,7 +2076,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  select max(foo COLLATE "C") filter (where (bar collate "POSIX") > '0')
  from (values ('a', 'b')) AS v(foo,bar);
   max 
-@@ -2064,11 +1897,7 @@
+@@ -2064,11 +1899,7 @@
  (1 row)
 
  select any_value(v) filter (where v > 2) from (values (1), (2), (3)) as v (v);
@@ -2087,7 +2089,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- outer reference in FILTER (PostgreSQL extension)
  select (select count(*)
          from (values (1)) t0(inner_c))
-@@ -2117,11 +1946,10 @@
+@@ -2117,11 +1948,10 @@
  select aggfns(distinct a,b,c order by a,c using ~<~,b) filter (where a > 1)
      from (values (1,3,'foo'),(0,null,null),(2,2,'bar'),(3,1,'baz')) v(a,b,c),
      generate_series(1,2) i;
@@ -2103,7 +2105,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- check handling of bare boolean Var in FILTER
  select max(0) filter (where b1) from bool_test;
   max 
-@@ -2137,78 +1965,49 @@
+@@ -2137,78 +1967,49 @@
 
  -- check for correct detection of nested-aggregate errors in FILTER
  select max(unique1) filter (where sum(ten) > 0) from tenk1;
@@ -2198,7 +2200,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  select percentile_disc(0.5) within group (order by thousand) from tenk1;
   percentile_disc 
  -----------------
-@@ -2217,161 +2016,97 @@
+@@ -2217,161 +2018,97 @@
 
  select rank(3) within group (order by x)
  from (values (1),(1),(2),(2),(3),(3),(4)) v(x);
@@ -2404,7 +2406,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- deparse and multiple features:
  create view aggordview1 as
  select ten,
-@@ -2380,73 +2115,83 @@
+@@ -2380,73 +2117,83 @@
         rank(5,'AZZZZ',50) within group (order by hundred, string4 desc, hundred)
    from tenk1
   group by ten order by ten;
@@ -2540,7 +2542,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create type avg_state as (total bigint, count bigint);
  create or replace function avg_transfn(state avg_state, n int) returns avg_state as
  $$
-@@ -2469,6 +2214,10 @@
+@@ -2469,6 +2216,10 @@
  	return null;
  end
  $$ language plpgsql;
@@ -2551,7 +2553,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create function avg_finalfn(state avg_state) returns int4 as
  $$
  begin
-@@ -2479,6 +2228,10 @@
+@@ -2479,6 +2230,10 @@
  	end if;
  end
  $$ language plpgsql;
@@ -2562,7 +2564,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create function sum_finalfn(state avg_state) returns int4 as
  $$
  begin
-@@ -2489,106 +2242,70 @@
+@@ -2489,106 +2244,70 @@
  	end if;
  end
  $$ language plpgsql;
@@ -2695,7 +2697,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- test that aggs with the same sfunc and initcond share the same agg state
  create aggregate my_sum_init(int4)
  (
-@@ -2597,6 +2314,12 @@
+@@ -2597,6 +2316,12 @@
     finalfunc = sum_finalfn,
     initcond = '(10,0)'
  );
@@ -2708,7 +2710,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create aggregate my_avg_init(int4)
  (
     stype = avg_state,
-@@ -2604,6 +2327,12 @@
+@@ -2604,6 +2329,12 @@
     finalfunc = avg_finalfn,
     initcond = '(10,0)'
  );
@@ -2721,7 +2723,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create aggregate my_avg_init2(int4)
  (
     stype = avg_state,
-@@ -2611,30 +2340,28 @@
+@@ -2611,30 +2342,28 @@
     finalfunc = avg_finalfn,
     initcond = '(4,0)'
  );
@@ -2766,7 +2768,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create or replace function sum_transfn(state int4, n int4) returns int4 as
  $$
  declare new_state int4;
-@@ -2664,29 +2391,35 @@
+@@ -2664,29 +2393,35 @@
  	end if;
  end
  $$ language plpgsql;
@@ -2811,7 +2813,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- test that the aggregate transition logic correctly handles
  -- transition / combine functions returning NULL
  -- First test the case of a normal transition function returning NULL
-@@ -2701,6 +2434,8 @@
+@@ -2701,6 +2436,8 @@
      END IF;
      RETURN NULL;
  END$$;
@@ -2820,7 +2822,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  CREATE AGGREGATE balk(int4)
  (
      SFUNC = balkifnull(int8, int4),
-@@ -2708,13 +2443,16 @@
+@@ -2708,13 +2445,16 @@
      PARALLEL = SAFE,
      INITCOND = '0'
  );
@@ -2842,7 +2844,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- Secondly test the case of a parallel aggregate combiner function
  -- returning NULL. For that use normal transition function, but a
  -- combiner function returning NULL.
-@@ -2730,6 +2468,23 @@
+@@ -2730,6 +2470,23 @@
      END IF;
      RETURN NULL;
  END$$;
@@ -2866,7 +2868,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  CREATE AGGREGATE balk(int4)
  (
      SFUNC = int4_sum(int8, int4),
-@@ -2738,26 +2493,27 @@
+@@ -2738,26 +2495,27 @@
      PARALLEL = SAFE,
      INITCOND = '0'
  );
@@ -2908,7 +2910,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  ROLLBACK;
  -- test multiple usage of an aggregate whose finalfn returns a R/W datum
  BEGIN;
-@@ -2767,6 +2523,8 @@
+@@ -2767,6 +2525,8 @@
      RETURN array_fill(y[1], ARRAY[4]);
  END;
  $$;
@@ -2917,7 +2919,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  CREATE FUNCTION rwagg_finalfunc(x anyarray) RETURNS anyarray
  LANGUAGE plpgsql STRICT IMMUTABLE AS $$
  DECLARE
-@@ -2777,11 +2535,25 @@
+@@ -2777,11 +2537,25 @@
      RETURN res;
  END;
  $$;
@@ -2943,7 +2945,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  CREATE FUNCTION eatarray(x real[]) RETURNS real[]
  LANGUAGE plpgsql STRICT IMMUTABLE AS $$
  BEGIN
-@@ -2789,21 +2561,44 @@
+@@ -2789,21 +2563,44 @@
      RETURN x;
  END;
  $$;
@@ -2993,7 +2995,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- variance(int4) covers numeric_poly_combine
  -- sum(int8) covers int8_avg_combine
  -- regr_count(float8, float8) covers int8inc_float8_float8 and aggregates with > 1 arg
-@@ -2813,36 +2608,17 @@
+@@ -2813,36 +2610,17 @@
        UNION ALL SELECT * FROM tenk1
        UNION ALL SELECT * FROM tenk1
        UNION ALL SELECT * FROM tenk1) u;
@@ -3036,7 +3038,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- variance(int8) covers numeric_combine
  -- avg(numeric) covers numeric_avg_combine
  EXPLAIN (COSTS OFF, VERBOSE)
-@@ -2851,46 +2627,22 @@
+@@ -2851,46 +2629,22 @@
        UNION ALL SELECT * FROM tenk1
        UNION ALL SELECT * FROM tenk1
        UNION ALL SELECT * FROM tenk1) u;
@@ -3091,7 +3093,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  -- Ensure that the STRICT checks for aggregates does not take NULLness
  -- of ORDER BY columns into account. See bug report around
  -- [email protected]
-@@ -2929,27 +2681,46 @@
+@@ -2929,27 +2683,46 @@
  -- does not lead to array overflow due to unexpected duplicate hash keys
  -- see CAFeeJoKKu0u+A_A9R9316djW-YW3-+Gtgvy3ju655qRHR3jtdA@mail.gmail.com
  set enable_memoize to off;
@@ -3150,7 +3152,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  select unique1, count(*), sum(twothousand) from tenk1
  group by unique1
  having sum(fivethous) > 4975
-@@ -3007,36 +2778,84 @@
+@@ -3007,36 +2780,84 @@
  (48 rows)
 
  set work_mem to default;
@@ -3244,7 +3246,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create table agg_group_2 as
  select * from
    (values (100), (300), (500)) as r(a),
-@@ -3047,30 +2866,58 @@
+@@ -3047,30 +2868,58 @@
      from agg_data_2k
      where g < r.a
      group by g/2) as s;
@@ -3310,7 +3312,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/aggregates.out --
  create table agg_hash_2 as
  select * from
    (values (100), (300), (500)) as r(a),
-@@ -3081,15 +2928,43 @@
+@@ -3081,15 +2930,43 @@
      from agg_data_2k
      where g < r.a
      group by g/2) as s;

pkg/cmd/roachtest/testdata/pg_regress/create_function_sql.diffs

@@ -820,7 +820,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_function_s
 
  -- Regression tests for bugs:
  -- Check that arguments that are R/W expanded datums aren't corrupted by
-@@ -674,70 +758,60 @@
+@@ -674,70 +758,61 @@
  CREATE FUNCTION double_append(anyarray, anyelement) RETURNS SETOF anyarray
  LANGUAGE SQL IMMUTABLE AS
  $$ SELECT array_append($1, $2) || array_append($1, $2) $$;
@@ -847,6 +847,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_function_s
 +array_append(timetz[], timetz) -> timetz[]
 +array_append(jsonb[], jsonb) -> jsonb[]
 +array_append(varbit[], varbit) -> varbit[]
++array_append(ltree[], ltree) -> ltree[]
 +array_append(anyenum[], anyenum) -> anyenum[]
 +array_append(tuple[], tuple) -> tuple[]
 +