Merge #154414 #154548

154414: roachtest/pg_regress: accept recent diff r=yuzefovich a=yuzefovich

Accept the diff over the last month. #154413 has been filed for a newly-discovered deviation around sequences.

Fixes: #151974
Release note: None

154548: roachtest: disable network partitions in mixed version tests r=williamchoe3,srosenberg a=DarrylWong

This mutator is currently causing test flakes and we need to revaluate our approach before re-enabling. See #154547.

Fixes: #153933
Fixes: #154501

Co-authored-by: Yahor Yuzefovich <[email protected]>
Co-authored-by: DarrylWong <[email protected]>

Author: 3 people

pkg/cmd/roachtest/roachtestutil/mixedversion/mutators.go

@@ -543,7 +543,8 @@ type networkPartitionMutator struct{}
 func (m networkPartitionMutator) Name() string { return failures.IPTablesNetworkPartitionName }
 
 func (m networkPartitionMutator) Probability() float64 {
-	return 0.3
+	// TODO(#154547)
+	return 0.0
 }
 
 func (m networkPartitionMutator) Generate(

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

@@ -169,7 +169,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/conversion.out --
    return;
  end;
  $$;
-+ERROR:  at or near "error": syntax error
++ERROR:  lexical error: error
 +DETAIL:  source SQL:
 +declare
 +  validlen int;

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

@@ -589,9 +589,9 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_function_s
 - functest_is_2 |                1 | a              | 
 - functest_is_2 |                2 | b              | 1
 - functest_is_3 |                1 | a              | 1
-+ functest_is_1 |                2 | b              | 
-+ functest_is_1 |                3 | c              | 
-+ functest_is_3 |                1 | a              | 
++ functest_is_1 |                2 | b              | 1:::INT8
++ functest_is_1 |                3 | c              | 'foo':::STRING
++ functest_is_3 |                1 | a              | 1:::INT8
   functest_is_3 |                2 | b              | 
 -(7 rows)
 +(5 rows)

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

@@ -667,7 +667,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_view.out -
 +WHERE c.relname OPERATOR(pg_catalog.~) '^(aliased_view_4)$' COLLATE pg_catalog.default
 +                                                                              ^
  ALTER TABLE tx1 RENAME TO a1;
-+ERROR:  cannot rename relation "tx1" because view "aliased_view_1" depends on it
++ERROR:  cannot rename relation "root.testviewschm2.tx1" because view "aliased_view_1" depends on it
 +HINT:  consider dropping "aliased_view_1" first.
  \d+ aliased_view_1
 -                    View "testviewschm2.aliased_view_1"
@@ -770,7 +770,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/create_view.out -
 +WHERE c.relname OPERATOR(pg_catalog.~) '^(aliased_view_4)$' COLLATE pg_catalog.default
 +                                                                              ^
  ALTER TABLE tt1 RENAME TO a2;
-+ERROR:  cannot rename relation "tt1" because view "aliased_view_1" depends on it
++ERROR:  cannot rename relation "root.testviewschm2.tt1" because view "aliased_view_1" depends on it
 +HINT:  consider dropping "aliased_view_1" first.
  \d+ aliased_view_1
 -                    View "testviewschm2.aliased_view_1"

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

@@ -523,7 +523,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/int8.out --label=
 - 1259
 +    oid     
 +------------
-+ 4294967082
++ 4294967081
  (1 row)
 
  -- bit operations

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

@@ -159,7 +159,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - "PgSQL"
 -(1 row)
 -
-+ERROR:  could not parse "\"\\x50\\u0067\\u{53}\\u{051}\\u{00004C}\"" as type jsonpath: lexical error: invalid syntax
++ERROR:  could not parse "\"\\x50\\u0067\\u{53}\\u{051}\\u{00004C}\"" as type jsonpath: at or near "invalid syntax": syntax error
 +DETAIL:  source SQL:
 +"\x50\u0067\u{53}\u{051}\u{00004C}"
 +^
@@ -205,7 +205,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  trailing junk after numeric literal at or near "1.t" of jsonpath input
 -LINE 1: select '1.type()'::jsonpath;
 -               ^
-+ERROR:  could not parse "1.type()" as type jsonpath: at or near "trailing junk after numeric literal at or near "1.t"": syntax error
++ERROR:  could not parse "1.type()" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1.t"
 +DETAIL:  source SQL:
 +1.type()
 +^
@@ -671,39 +671,39 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  trailing junk after numeric literal at or near "1a" of jsonpath input
 -LINE 1: select '1a'::jsonpath;
 -               ^
-+ERROR:  could not parse "1a" as type jsonpath: at or near "trailing junk after numeric literal at or near "1a"": syntax error
++ERROR:  could not parse "1a" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1a"
 +DETAIL:  source SQL:
 +1a
 +^
  select '1e'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1e" of jsonpath input
 -LINE 1: select '1e'::jsonpath;
 -               ^
-+ERROR:  could not parse "1e" as type jsonpath: at or near "invalid floating point literal": syntax error
++ERROR:  could not parse "1e" as type jsonpath: lexical error: invalid floating point literal
 +DETAIL:  source SQL:
 +1e
 +^
  select '1.e'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1.e" of jsonpath input
 -LINE 1: select '1.e'::jsonpath;
 -               ^
-+ERROR:  could not parse "1.e" as type jsonpath: at or near "invalid floating point literal": syntax error
++ERROR:  could not parse "1.e" as type jsonpath: lexical error: invalid floating point literal
 +DETAIL:  source SQL:
 +1.e
 +^
  select '1.2a'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1.2a" of jsonpath input
 -LINE 1: select '1.2a'::jsonpath;
 -               ^
-+ERROR:  could not parse "1.2a" as type jsonpath: at or near "trailing junk after numeric literal at or near "1.2a"": syntax error
++ERROR:  could not parse "1.2a" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1.2a"
 +DETAIL:  source SQL:
 +1.2a
 +^
  select '1.2e'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1.2e" of jsonpath input
 -LINE 1: select '1.2e'::jsonpath;
 -               ^
-+ERROR:  could not parse "1.2e" as type jsonpath: at or near "invalid floating point literal": syntax error
++ERROR:  could not parse "1.2e" as type jsonpath: lexical error: invalid floating point literal
 +DETAIL:  source SQL:
 +1.2e
 +^
@@ -768,7 +768,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  trailing junk after numeric literal at or near "1.2e3a" of jsonpath input
 -LINE 1: select '1.2e3a'::jsonpath;
 -               ^
-+ERROR:  could not parse "1.2e3a" as type jsonpath: at or near "trailing junk after numeric literal at or near "1.2e3a"": syntax error
++ERROR:  could not parse "1.2e3a" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1.2e3a"
 +DETAIL:  source SQL:
 +1.2e3a
 +^
@@ -839,7 +839,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 37
 -(1 row)
 -
-+ERROR:  could not parse "0b100101" as type jsonpath: at or near "trailing junk after numeric literal at or near "0b"": syntax error
++ERROR:  could not parse "0b100101" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0b"
 +DETAIL:  source SQL:
 +0b100101
 +^
@@ -849,7 +849,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 187
 -(1 row)
 -
-+ERROR:  could not parse "0o273" as type jsonpath: at or near "trailing junk after numeric literal at or near "0o"": syntax error
++ERROR:  could not parse "0o273" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0o"
 +DETAIL:  source SQL:
 +0o273
 +^
@@ -863,71 +863,71 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  trailing junk after numeric literal at or near "0b" of jsonpath input
 -LINE 1: select '0b'::jsonpath;
 -               ^
-+ERROR:  could not parse "0b" as type jsonpath: at or near "trailing junk after numeric literal at or near "0b"": syntax error
++ERROR:  could not parse "0b" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0b"
 +DETAIL:  source SQL:
 +0b
 +^
  select '1b'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1b" of jsonpath input
 -LINE 1: select '1b'::jsonpath;
 -               ^
-+ERROR:  could not parse "1b" as type jsonpath: at or near "trailing junk after numeric literal at or near "1b"": syntax error
++ERROR:  could not parse "1b" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1b"
 +DETAIL:  source SQL:
 +1b
 +^
  select '0b0x'::jsonpath;
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '0b0x'::jsonpath;
 -               ^
-+ERROR:  could not parse "0b0x" as type jsonpath: at or near "trailing junk after numeric literal at or near "0b"": syntax error
++ERROR:  could not parse "0b0x" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0b"
 +DETAIL:  source SQL:
 +0b0x
 +^
  select '0o'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "0o" of jsonpath input
 -LINE 1: select '0o'::jsonpath;
 -               ^
-+ERROR:  could not parse "0o" as type jsonpath: at or near "trailing junk after numeric literal at or near "0o"": syntax error
++ERROR:  could not parse "0o" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0o"
 +DETAIL:  source SQL:
 +0o
 +^
  select '1o'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1o" of jsonpath input
 -LINE 1: select '1o'::jsonpath;
 -               ^
-+ERROR:  could not parse "1o" as type jsonpath: at or near "trailing junk after numeric literal at or near "1o"": syntax error
++ERROR:  could not parse "1o" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1o"
 +DETAIL:  source SQL:
 +1o
 +^
  select '0o0x'::jsonpath;
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '0o0x'::jsonpath;
 -               ^
-+ERROR:  could not parse "0o0x" as type jsonpath: at or near "trailing junk after numeric literal at or near "0o"": syntax error
++ERROR:  could not parse "0o0x" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0o"
 +DETAIL:  source SQL:
 +0o0x
 +^
  select '0x'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "0x" of jsonpath input
 -LINE 1: select '0x'::jsonpath;
 -               ^
-+ERROR:  could not parse "0x" as type jsonpath: lexical error: invalid hexadecimal numeric literal
++ERROR:  could not parse "0x" as type jsonpath: at or near "invalid hexadecimal numeric literal": syntax error
 +DETAIL:  source SQL:
 +0x
 +^
  select '1x'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1x" of jsonpath input
 -LINE 1: select '1x'::jsonpath;
 -               ^
-+ERROR:  could not parse "1x" as type jsonpath: at or near "invalid hexadecimal numeric literal": syntax error
++ERROR:  could not parse "1x" as type jsonpath: lexical error: invalid hexadecimal numeric literal
 +DETAIL:  source SQL:
 +1x
 +^
  select '0x0y'::jsonpath;
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '0x0y'::jsonpath;
 -               ^
-+ERROR:  could not parse "0x0y" as type jsonpath: at or near "trailing junk after numeric literal at or near "0x0y"": syntax error
++ERROR:  could not parse "0x0y" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0x0y"
 +DETAIL:  source SQL:
 +0x0y
 +^
@@ -938,7 +938,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 1000000
 -(1 row)
 -
-+ERROR:  could not parse "1_000_000" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000_000" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000_000
 +^
@@ -948,7 +948,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 123
 -(1 row)
 -
-+ERROR:  could not parse "1_2_3" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_2_3" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_2_3
 +^
@@ -958,7 +958,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 518979583
 -(1 row)
 -
-+ERROR:  could not parse "0x1EEE_FFFF" as type jsonpath: at or near "trailing junk after numeric literal at or near "0x1EEE_"": syntax error
++ERROR:  could not parse "0x1EEE_FFFF" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0x1EEE_"
 +DETAIL:  source SQL:
 +0x1EEE_FFFF
 +^
@@ -968,7 +968,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 187
 -(1 row)
 -
-+ERROR:  could not parse "0o2_73" as type jsonpath: at or near "trailing junk after numeric literal at or near "0o"": syntax error
++ERROR:  could not parse "0o2_73" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0o"
 +DETAIL:  source SQL:
 +0o2_73
 +^
@@ -978,7 +978,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 37
 -(1 row)
 -
-+ERROR:  could not parse "0b10_0101" as type jsonpath: at or near "trailing junk after numeric literal at or near "0b"": syntax error
++ERROR:  could not parse "0b10_0101" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0b"
 +DETAIL:  source SQL:
 +0b10_0101
 +^
@@ -988,7 +988,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 1000.000005
 -(1 row)
 -
-+ERROR:  could not parse "1_000.000_005" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000.000_005" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000.000_005
 +^
@@ -998,7 +998,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 1000
 -(1 row)
 -
-+ERROR:  could not parse "1_000." as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000." as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000.
 +^
@@ -1018,7 +1018,7 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 - 10005
 -(1 row)
 -
-+ERROR:  could not parse "1_000.5e0_1" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000.5e0_1" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000.5e0_1
 +^
@@ -1035,15 +1035,15 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  trailing junk after numeric literal at or near "100_" of jsonpath input
 -LINE 1: select '100_'::jsonpath;
 -               ^
-+ERROR:  could not parse "100_" as type jsonpath: at or near "trailing junk after numeric literal at or near "100_"": syntax error
++ERROR:  could not parse "100_" as type jsonpath: lexical error: trailing junk after numeric literal at or near "100_"
 +DETAIL:  source SQL:
 +100_
 +^
  select '100__000'::jsonpath;
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '100__000'::jsonpath;
 -               ^
-+ERROR:  could not parse "100__000" as type jsonpath: at or near "trailing junk after numeric literal at or near "100_"": syntax error
++ERROR:  could not parse "100__000" as type jsonpath: lexical error: trailing junk after numeric literal at or near "100_"
 +DETAIL:  source SQL:
 +100__000
 +^
@@ -1059,31 +1059,31 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  trailing junk after numeric literal at or near "1_000_" of jsonpath input
 -LINE 1: select '1_000_.5'::jsonpath;
 -               ^
-+ERROR:  could not parse "1_000_.5" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000_.5" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000_.5
 +^
  select '1_000._5'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1_000._" of jsonpath input
 -LINE 1: select '1_000._5'::jsonpath;
 -               ^
-+ERROR:  could not parse "1_000._5" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000._5" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000._5
 +^
  select '1_000.5_'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1_000.5_" of jsonpath input
 -LINE 1: select '1_000.5_'::jsonpath;
 -               ^
-+ERROR:  could not parse "1_000.5_" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000.5_" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000.5_
 +^
  select '1_000.5e_1'::jsonpath;
 -ERROR:  trailing junk after numeric literal at or near "1_000.5e" of jsonpath input
 -LINE 1: select '1_000.5e_1'::jsonpath;
 -               ^
-+ERROR:  could not parse "1_000.5e_1" as type jsonpath: at or near "trailing junk after numeric literal at or near "1_"": syntax error
++ERROR:  could not parse "1_000.5e_1" as type jsonpath: lexical error: trailing junk after numeric literal at or near "1_"
 +DETAIL:  source SQL:
 +1_000.5e_1
 +^
@@ -1092,23 +1092,23 @@ diff -U3 --label=/mnt/data1/postgres/src/test/regress/expected/jsonpath.out --la
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '0b_10_0101'::jsonpath;
 -               ^
-+ERROR:  could not parse "0b_10_0101" as type jsonpath: at or near "trailing junk after numeric literal at or near "0b"": syntax error
++ERROR:  could not parse "0b_10_0101" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0b"
 +DETAIL:  source SQL:
 +0b_10_0101
 +^
  select '0o_273'::jsonpath;
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '0o_273'::jsonpath;
 -               ^
-+ERROR:  could not parse "0o_273" as type jsonpath: at or near "trailing junk after numeric literal at or near "0o"": syntax error
++ERROR:  could not parse "0o_273" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0o"
 +DETAIL:  source SQL:
 +0o_273
 +^
  select '0x_42F'::jsonpath;
 -ERROR:  syntax error at end of jsonpath input
 -LINE 1: select '0x_42F'::jsonpath;
 -               ^
-+ERROR:  could not parse "0x_42F" as type jsonpath: at or near "trailing junk after numeric literal at or near "0x_"": syntax error
++ERROR:  could not parse "0x_42F" as type jsonpath: lexical error: trailing junk after numeric literal at or near "0x_"
 +DETAIL:  source SQL:
 +0x_42F
 +^